submitted patch from Stefan Sels that fixes the i18n problem (hopefully)

[squirrelmail.git] / functions / i18n.php

diff --git a/functions/i18n.php b/functions/i18n.php
index 905da99da6bd73271e59eced1fde215b7bc7e6ba..c2e581650a81151a4e9dca6643f182a1f17636c0 100644 (file)
--- a/functions/i18n.php
+++ b/functions/i18n.php
@@ -15,6 +15,7 @@
 
    // This array specifies the available languages.
    $languages["en"]["NAME"]    = "English";
+       $languages["en"]["CHARSET"] = "iso-8859-1";
    $languages["no"]["NAME"]    = "Norwegian (Bokmål)";
    $languages["no"]["CHARSET"] = "iso-8859-1";
    $languages["no_NO_ny"]["NAME"] = "Norwegian (Nynorsk)";
@@ -57,7 +58,7 @@
 
       if ($debug_mime) $string = $charset.":".$string;
 
-      if (ereg("iso-8859-(.*)", $charset, $res)) {
+      if (ereg("iso-8859-([[:digit:]]+)", $charset, $res)) {
          if ($res[1] == "1")
             return charset_decode_iso_8859_1 ($string);
          else if ($res[1] == "2")
@@ -723,7 +724,7 @@
    function set_up_language($sm_language, $do_search = false)
    {
       static $SetupAlready = 0;
-      global $HTTP_ACCEPT_LANGUAGE;
+               global $HTTP_ACCEPT_LANGUAGE, $use_gettext, $languages, $squirrelmail_language;
       
       if ($SetupAlready)
          return;
@@ -734,7 +735,7 @@
       }
       
       if (isset($sm_language) && $use_gettext &&
-         $sm_language != "en" && $squirrelmail_language != "" &&
+         $squirrelmail_language != "" &&
          $languages[$sm_language]["CHARSET"]) {
          putenv("LC_ALL=".$sm_language);
          bindtextdomain("squirrelmail", "../locale/");