wamo/gnu-social
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Ignore user language settings that aren't listed in language config; we'll then fall back to current autodetection. This prevents the surprises where your profile suddenly switches to Arabic because it was selected by default due to lack of a match in the drop-down box.

Browse Source
This commit is contained in:
Brion Vibber 2009-12-19 14:03:31 -05:00
parent 2fb76eec62
commit f987273f11
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lib/util.php
View File

@ -91,8 +91,16 @@ function common_language()
if (_have_config() && common_logged_in()) { if (_have_config() && common_logged_in()) {
$user = common_current_user(); $user = common_current_user();
$user_language = $user->language; $user_language = $user->language;
if ($user_language)
return $user_language; if ($user->language) {
// Validate -- we don't want to end up with a bogus code
// left over from some old junk.
foreach (common_config('site', 'languages') as $code => $info) {
if ($info['lang'] == $user_language) {
return $user_language;
}
}
}
} }
// Otherwise, find the best match for the languages requested by the // Otherwise, find the best match for the languages requested by the