summaryrefslogtreecommitdiffstats
path: root/settings
diff options
context:
space:
mode:
authorJan-Christoph Borchardt <hey@jancborchardt.net>2013-05-10 08:41:27 -0700
committerJan-Christoph Borchardt <hey@jancborchardt.net>2013-05-10 08:41:27 -0700
commitf3f74f826acc149385ae9c8480da04128b470080 (patch)
treeaaa2749fd3647c3916d155d5eecfa291ebf9876f /settings
parent9f3c156acad477e34d602638cf75b123247ff072 (diff)
parentee1ce055fc6bbd543d31ef8c443bc379e7476e8d (diff)
downloadnextcloud-server-f3f74f826acc149385ae9c8480da04128b470080.tar.gz
nextcloud-server-f3f74f826acc149385ae9c8480da04128b470080.zip
Merge pull request #3257 from owncloud/fix_3251
Fix 3251
Diffstat (limited to 'settings')
-rw-r--r--settings/personal.php5
1 files changed, 3 insertions, 2 deletions
diff --git a/settings/personal.php b/settings/personal.php
index de029770d98..cab6e56dada 100644
--- a/settings/personal.php
+++ b/settings/personal.php
@@ -29,8 +29,7 @@ $commonlangcodes = array(
$languageNames=include 'languageCodes.php';
$languages=array();
-// Initialize array, so we can substitue later with our in $commonlangcodes specified order
-$commonlanguages = array_fill(0, count($commonlangcodes), "");
+$commonlanguages = array();
foreach($languageCodes as $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
@@ -52,6 +51,8 @@ foreach($languageCodes as $lang) {
}
}
+ksort($commonlanguages);
+
// sort now by displayed language not the iso-code
usort( $languages, function ($a, $b) {
return strcmp($a['name'], $b['name']);