Fix setting locales under Solaris - use additional .UTF-8 suffix (#1488628)

pull/22/head
Aleksander Machniak 12 years ago
parent da28121dcd
commit 553225e1be

@ -1,6 +1,7 @@
CHANGELOG Roundcube Webmail CHANGELOG Roundcube Webmail
=========================== ===========================
- Fix setting locales under Solaris - use additional .UTF-8 suffix (#1488628)
- Fix email address validation for addresses with IP address in domain part - Fix email address validation for addresses with IP address in domain part
- Fix Larry skin issues in IE7 compat. mode (#1488618) - Fix Larry skin issues in IE7 compat. mode (#1488618)
- Fix so subscribed non-existing/non-accessible shared folder can be unsubscribed - Fix so subscribed non-existing/non-accessible shared folder can be unsubscribed

@ -157,14 +157,16 @@ class rcmail extends rcube
$this->config->set_user_prefs((array)$this->user->get_prefs()); $this->config->set_user_prefs((array)$this->user->get_prefs());
} }
$_SESSION['language'] = $this->user->language = $this->language_prop($this->config->get('language', $_SESSION['language'])); $lang = $this->language_prop($this->config->get('language', $_SESSION['language']));
$_SESSION['language'] = $this->user->language = $lang;
// set localization // set localization
setlocale(LC_ALL, $_SESSION['language'] . '.utf8', 'en_US.utf8'); setlocale(LC_ALL, $lang . '.utf8', $lang . '.UTF-8', 'en_US.utf8', 'en_US.UTF-8');
// workaround for http://bugs.php.net/bug.php?id=18556 // workaround for http://bugs.php.net/bug.php?id=18556
if (in_array($_SESSION['language'], array('tr_TR', 'ku', 'az_AZ'))) if (in_array($lang, array('tr_TR', 'ku', 'az_AZ'))) {
setlocale(LC_CTYPE, 'en_US' . '.utf8'); setlocale(LC_CTYPE, 'en_US.utf8', 'en_US.UTF-8');
}
} }

Loading…
Cancel
Save