Changeset 3059:163797a9e57c
- Timestamp:
- 07/17/15 14:49:11 (9 years ago)
- Branch:
- default
- Location:
- inc
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
inc/admin/prepend.php
r2815 r3059 35 35 l10n::set(dirname(__FILE__).'/../../locales/'.$_lang.'/public'); 36 36 l10n::set(dirname(__FILE__).'/../../locales/'.$_lang.'/plugins'); 37 38 // Set lexical lang 39 dcUtils::setlexicalLang('admin',$_lang); 37 40 } 38 41 -
inc/core/class.dc.utils.php
r3057 r3059 105 105 * @param string $lang language to be used if $ns = 'lang' 106 106 */ 107 public static function lexicalSort(&$arr,$ns='admin',$lang='en_US') 108 { 109 dcUtils::setLexicalLang($ns,$lang); 107 public static function lexicalSort(&$arr,$ns='',$lang='en_US') 108 { 109 if ($ns != '') { 110 dcUtils::setLexicalLang($ns,$lang); 111 } 110 112 return usort($arr,array('dcUtils','lexicalSortHelper')); 111 113 } … … 118 120 * @param string $lang language to be used if $ns = 'lang' 119 121 */ 120 public static function lexicalArraySort(&$arr,$ns='admin',$lang='en_US') 121 { 122 dcUtils::setLexicalLang($ns,$lang); 122 public static function lexicalArraySort(&$arr,$ns='',$lang='en_US') 123 { 124 if ($ns != '') { 125 dcUtils::setLexicalLang($ns,$lang); 126 } 123 127 return uasort($arr,array('dcUtils','lexicalSortHelper')); 124 128 } … … 131 135 * @param string $lang language to be used if $ns = 'lang' 132 136 */ 133 public static function lexicalKeySort(&$arr,$ns='admin',$lang='en_US') 134 { 135 dcUtils::setLexicalLang($ns,$lang); 137 public static function lexicalKeySort(&$arr,$ns='',$lang='en_US') 138 { 139 if ($ns != '') { 140 dcUtils::setLexicalLang($ns,$lang); 141 } 136 142 return uksort($arr,array('dcUtils','lexicalSortHelper')); 137 143 } 138 144 139 public static function setLexicalLang($ns=' admin',$lang='en_US')145 public static function setLexicalLang($ns='',$lang='en_US') 140 146 { 141 147 global $core; … … 147 153 $user_language = $core->auth->getInfo('user_lang'); 148 154 setlocale(LC_COLLATE, $user_language); 155 break; 149 156 case 'public': 150 157 // Set locale with blog params 151 158 $blog_language = $core->blog->settings->system->lang; 152 159 setlocale(LC_COLLATE, $blog_language); 160 break; 153 161 case 'lang': 154 162 // Set locale with arg 155 163 setlocale(LC_COLLATE, $lang); 164 break; 156 165 } 157 166 } -
inc/public/prepend.php
r2567 r3059 75 75 l10n::set(dirname(__FILE__).'/../../locales/'.$_lang.'/public'); 76 76 l10n::set(dirname(__FILE__).'/../../locales/'.$_lang.'/plugins'); 77 78 // Set lexical lang 79 dcUtils::setlexicalLang('public',$_lang); 77 80 78 81 # Loading plugins
Note: See TracChangeset
for help on using the changeset viewer.