Set system locales separately

The motranslator no longer does this, see
https://github.com/phpmyadmin/motranslator/issues/24

Signed-off-by: Michal Čihař <michal@cihar.com>
This commit is contained in:
Michal Čihař 2018-02-12 14:17:43 +01:00
parent 3e1f8b2e6e
commit 0870b2b0ae
2 changed files with 5 additions and 1 deletions

View File

@ -39,7 +39,7 @@
"ext-pcre": "*",
"ext-json": "*",
"phpmyadmin/sql-parser": "^4.2.3",
"phpmyadmin/motranslator": "^3.4",
"phpmyadmin/motranslator": "^4.0",
"phpmyadmin/shapefile": "^2.0",
"tecnickcom/tcpdf": "^6.2",
"phpseclib/phpseclib": "^2.0",

View File

@ -174,6 +174,10 @@ class Language
_setlocale(0, $this->code);
_bindtextdomain('phpmyadmin', LOCALE_PATH);
_textdomain('phpmyadmin');
// Set PHP locale as well
if (function_exists('setlocale')) {
setlocale(0, $locale);
}
/* Text direction for language */
if ($this->isRTL()) {