X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=functions%2Fi18n.php;h=f9ba45074b85dde6624cb38fecbcd1d204e0c922;hb=b3c9b2de4190bf6a8d7a6e7437523d291442b093;hp=a25dce1b9bfa9a238d939e86188574088e7afff9;hpb=f3df1364cd0eb505640905fc15bc0800be029cfe;p=squirrelmail.git

diff --git a/functions/i18n.php b/functions/i18n.php
index a25dce1b..f9ba4507 100644
--- a/functions/i18n.php
+++ b/functions/i18n.php
@@ -24,9 +24,15 @@
    $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['cs']['ALIAS']      = 'cs_CZ';
+   $languages['cz']['ALIAS']      = 'cs_CZ'; // set up by some ancient versions of IE
    
    $languages['da']['NAME']    = 'Danish';
    $languages['da']['CHARSET'] = 'iso-8859-1';
@@ -113,7 +119,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';
@@ -122,6 +128,7 @@
    
    $languages['sk_SK']['NAME']     = 'Slovak';
    $languages['sk_SK']['CHARSET']  = 'iso-8859-2';
+   $languages['sk']['ALIAS']       = 'sk_SK';
    
    $languages['ro']['NAME']    = 'Romanian';
    $languages['ro']['CHARSET'] = 'iso-8859-2';
@@ -832,7 +839,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'];
@@ -846,7 +853,7 @@
          setlocale('LC_ALL', $sm_notAlias);
          bindtextdomain('squirrelmail', '../locale/');
          textdomain('squirrelmail');
-         header ('Content-Type: text/html; charset=' . $languages[$sm_language]['CHARSET']);
+         header ('Content-Type: text/html; charset=' . $languages[$sm_notAlias]['CHARSET']);
       }
    }
 
@@ -869,4 +876,4 @@
      if ($my_charset) $default_charset=$my_charset;
    }
 
-?>
\ No newline at end of file
+?>