[ squirrelmail-Internationalization-476567 ] wrong character set

[squirrelmail.git] / functions / i18n.php

diff --git a/functions/i18n.php b/functions/i18n.php
index a25dce1b9bfa9a238d939e86188574088e7afff9..2ce053dc8711d911a6f2f1440282f2cbfd75c1c5 100644 (file)
--- a/functions/i18n.php
+++ b/functions/i18n.php
@@ -24,9 +24,13 @@
    $languages['ca']['CHARSET'] = 'iso-8859-1';
    $languages['ca_CA']['ALIAS'] = 'ca';
 
-   $languages['cs']['NAME']    = 'Czech';
-   $languages['cs']['CHARSET'] = 'iso-8859-2';
-   $languages['cs_CZ']['ALIAS'] = 'cs';
+   /* PLEASE DON'T TOUCH!!!
+    * Correct locale name, which should be set by setlocale and/or putenv('LC_ALL='...)
+       * is 'cs_CZ' and NOT 'cs', this applies to all locale names, look into docs, if you
+       * don't believe me.  Ondrej Sury, czech and slovak translator.
+       */
+   $languages['cs_CZ']['NAME']    = 'Czech';
+   $languages['cs_CZ']['CHARSET'] = 'iso-8859-2';
    
    $languages['da']['NAME']    = 'Danish';
    $languages['da']['CHARSET'] = 'iso-8859-1';
@@ -113,7 +117,7 @@
    $languages['sv_SV']['ALIAS'] = 'sv';
    
    $languages['tr']['NAME']    = 'Turkish';
-   $languages['tr']['CHARSET'] = 'iso-8859-1';
+   $languages['tr']['CHARSET'] = 'iso-8859-9';
    $languages['tr_TR']['ALIAS'] = 'tr';
    
    $languages['tw']['NAME']    = 'Taiwan';
@@ -832,7 +836,7 @@
          $sm_language = substr($HTTP_ACCEPT_LANGUAGE, 0, 2);
       }
       if (!$sm_language && isset($squirrelmail_default_language))
-         $sm_language = $squirrelmail_default_language;
+         $squirrelmail_language = $squirrelmail_default_language;
       $sm_notAlias = $sm_language;
       while (isset($languages[$sm_notAlias]['ALIAS']))
          $sm_notAlias = $languages[$sm_notAlias]['ALIAS'];