GNUsocial/gnu-social
4
0
Fork 1
Code Issues 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 a43c310fbc
commit b244ac6462
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/util.php
View File

@ -91,9 +91,17 @@ 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)
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; 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
// user's browser... // user's browser...