Merged changes from mai trunk up to 2.3.1

[fa-stable.git] / includes / lang / gettext.php

diff --git a/includes/lang/gettext.php b/includes/lang/gettext.php
index 4d80c9b3b163af0b09b5013840e8700e65a2eb62..7d26256d51a2917f28e234dfb010a11ff7c50b68 100644 (file)
--- a/includes/lang/gettext.php
+++ b/includes/lang/gettext.php
@@ -104,7 +104,8 @@ class gettext_native_support
         */
        function check_support($lang_code, $encoding)
     {
-
+               if (strtoupper(substr(PHP_OS, 0, 3)) === 'WIN') // don't do this test if server is WIN
+                       return true;
                $old = setlocale(LC_CTYPE, '0'); // LC_MESSAGES does not exist on Win
                $up = strtoupper($encoding);
                $low = strtolower($encoding);