mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Sort priorized languages as defined in the array 

Also add russian and arabic to the common languages.
This commit is contained in:
kondou 2013-05-01 00:34:13 +02:00
parent 4ab3614248
commit d8e6db5608
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
settings/personal.php
View File

@ -24,12 +24,13 @@ $languageCodes=OC_L10N::findAvailableLanguages();
// array of common languages // array of common languages
$commonlangcodes = array( $commonlangcodes = array(
'en', 'es', 'fr', 'de', 'de_DE', 'ja_JP', 'nl', 'it', 'pt_BR', 'pt_PT', 'da', 'fi_FI', 'nb_NO', 'sv', 'zh_CN', 'ko' 'en', 'es', 'fr', 'de', 'de_DE', 'ja_JP', 'ar', 'ru', 'nl', 'it', 'pt_BR', 'pt_PT', 'da', 'fi_FI', 'nb_NO', 'sv', 'zh_CN', 'ko'
); );
$languageNames=include 'languageCodes.php'; $languageNames=include 'languageCodes.php';
$languages=array(); $languages=array();
$commonlanguages = array(); // Initialize array, so we can substitue later with our in $commonlangcodes specified order
$commonlanguages = array_fill(0, count($commonlangcodes), "");
foreach($languageCodes as $lang) { foreach($languageCodes as $lang) {
$l=OC_L10N::get('settings', $lang); $l=OC_L10N::get('settings', $lang);
if(substr($l->t('__language_name__'), 0, 1)!='_') {//first check if the language name is in the translation file if(substr($l->t('__language_name__'), 0, 1)!='_') {//first check if the language name is in the translation file
@ -45,7 +46,7 @@ foreach($languageCodes as $lang) {
if ($lang === $userLang) { if ($lang === $userLang) {
$userLang = $ln; $userLang = $ln;
} elseif (in_array($lang, $commonlangcodes)) { } elseif (in_array($lang, $commonlangcodes)) {
$commonlanguages[]=$ln; $commonlanguages[array_search($lang, $commonlangcodes)]=$ln;
} else { } else {
$languages[]=$ln; $languages[]=$ln;
} }