diff --git a/composer.json b/composer.json index 596dae291b..11e4343072 100644 --- a/composer.json +++ b/composer.json @@ -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", diff --git a/libraries/Language.php b/libraries/Language.php index 8dd53ed6be..f9f9cfcc8c 100644 --- a/libraries/Language.php +++ b/libraries/Language.php @@ -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, $this->code); + } /* Text direction for language */ if ($this->isRTL()) {