Fixed bug #431256 - Alias expanded not RFC 821-compatible

[squirrelmail.git] / functions / i18n.php

diff --git a/functions/i18n.php b/functions/i18n.php
index 8587e0781252383646a268bdd32e3e37af7c2d1b..f9ba45074b85dde6624cb38fecbcd1d204e0c922 100644 (file)
--- a/functions/i18n.php
+++ b/functions/i18n.php
@@ -31,6 +31,8 @@
        */
    $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';
@@ -117,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';
@@ -126,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';
@@ -850,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']);
       }
    }
 
@@ -873,4 +876,4 @@
      if ($my_charset) $default_charset=$my_charset;
    }
 
-?>
\ No newline at end of file
+?>