Merge branch 'master' into fix-email-address-maintenance-bug-1543
This commit is contained in:
commit
508226374a
1 changed files with 2 additions and 2 deletions
|
@ -302,9 +302,9 @@ class L10n {
|
|||
$locale = self::$locales[$translation_code];
|
||||
|
||||
// set up locale
|
||||
if ( !putenv("LANG=$locale") ) {
|
||||
if ( !putenv("LANGUAGE=$locale") ) {
|
||||
trigger_error("L10n::set_translation(): could not set the ".
|
||||
"environment variable LANG to $locale", E_USER_WARNING);
|
||||
"environment variable LANGUAGE to $locale", E_USER_WARNING);
|
||||
return false;
|
||||
}
|
||||
if ( !setlocale(LC_ALL, $locale) ) {
|
||||
|
|
Loading…
Reference in a new issue