comparison msitegen.inc.php @ 561:6b4cbd590d35

More locale initialization refactoring.
author Matti Hamalainen <ccr@tnsp.org>
date Tue, 24 Dec 2013 22:25:27 +0200
parents 279a98abe3d3
children d576bc58df3c
comparison
equal deleted inserted replaced
560:279a98abe3d3 561:6b4cbd590d35
653 return sprintf("%-".$len."s", stStrChop($str, $len)); 653 return sprintf("%-".$len."s", stStrChop($str, $len));
654 } 654 }
655 655
656 656
657 657
658 function cmLocaleInit()
659 {
660 global $pageCharset;
661
662 if (!isset($pageCharset))
663 $pageCharset = "UTF-8";
664
665 mb_internal_encoding($pageCharset);
666
667 $tmp = "en_US.".strtolower(str_replace("-", "", $pageCharset));
668 setlocale(LC_ALL, $tmp);
669 }
670
671
672 function cmPrintCSSLine($uri, $media = "") 658 function cmPrintCSSLine($uri, $media = "")
673 { 659 {
674 echo 660 echo
675 " <link rel=\"stylesheet\" href=\"css/".$uri. 661 " <link rel=\"stylesheet\" href=\"css/".$uri.
676 "\" type=\"text/css\" ".($media != "" ? "media=\"".$media."\"": "")." />\n"; 662 "\" type=\"text/css\" ".($media != "" ? "media=\"".$media."\"": "")." />\n";
678 664
679 665
680 function cmPrintPageHeader($pageTitle, $pageExtra = "", $useContents = TRUE) 666 function cmPrintPageHeader($pageTitle, $pageExtra = "", $useContents = TRUE)
681 { 667 {
682 global $pageCSS, $pageCharset, $pageAuthor, $pageCSSData, $pageUrchin; 668 global $pageCSS, $pageCharset, $pageAuthor, $pageCSSData, $pageUrchin;
683
684 cmLocaleInit();
685 669
686 echo 670 echo
687 "<!DOCTYPE html>\n". 671 "<!DOCTYPE html>\n".
688 "<html>\n". 672 "<html>\n".
689 "<head>\n". 673 "<head>\n".
799 $sql = "UPDATE dbmeta SET ".stGetSettingSQL($item, $value)." WHERE key=".$dbh->quote($name); 783 $sql = "UPDATE dbmeta SET ".stGetSettingSQL($item, $value)." WHERE key=".$dbh->quote($name);
800 return stDBExecSQL($dbh, $sql); 784 return stDBExecSQL($dbh, $sql);
801 } 785 }
802 786
803 787
788 //
789 // Global locale initialization
790 //
791 if (!isset($localeInited) || !$localeInited)
792 {
793 $localeInited = TRUE;
794
795 if (!isset($pageCharset))
796 $pageCharset = "UTF-8";
797
798 mb_internal_encoding($pageCharset);
799
800 $tmp = "en_US.".strtolower(str_replace("-", "", $pageCharset));
801 setlocale(LC_ALL, $tmp);
802 }
804 ?> 803 ?>