summaryrefslogtreecommitdiffstats
path: root/settings/personal.php
diff options
context:
space:
mode:
authorRobin Appelman <icewind@owncloud.com>2012-02-01 15:57:32 +0100
committerRobin Appelman <icewind@owncloud.com>2012-02-01 15:57:32 +0100
commitd514b1d92d7dad93ddb640829e4598fb6f49fa84 (patch)
treeb650be0a3cf85194bdd92b97697ad7cc7936f62e /settings/personal.php
parent0124809a42dd72d9c6d9b550687fa0013a88b6da (diff)
parent6583d30e26d752c5ddccb1e350e075f59b7ba75d (diff)
downloadnextcloud-server-d514b1d92d7dad93ddb640829e4598fb6f49fa84.tar.gz
nextcloud-server-d514b1d92d7dad93ddb640829e4598fb6f49fa84.zip
Merge branch 'master' into filesystem
Diffstat (limited to 'settings/personal.php')
-rwxr-xr-xsettings/personal.php4
1 files changed, 3 insertions, 1 deletions
diff --git a/settings/personal.php b/settings/personal.php
index 8e888760052..07030109de7 100755
--- a/settings/personal.php
+++ b/settings/personal.php
@@ -24,8 +24,10 @@ $relative=round(($used/$total)*10000)/100;
$email=OC_Preferences::getValue(OC_User::getUser(), 'settings','email','');
-$lang=OC_Preferences::getValue( OC_User::getUser(), 'core', 'lang', 'en' );
+$lang=OC_Preferences::getValue( OC_User::getUser(), 'core', 'lang', OC_L10N::findLanguage() );
$languageCodes=OC_L10N::findAvailableLanguages();
+sort ($languageCodes);
+
//put the current language in the front
unset($languageCodes[array_search($lang,$languageCodes)]);
array_unshift($languageCodes,$lang);