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

git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@878 7612ce4b-ef26-0410-bec9-ea0150e637f0

diff --git a/functions/i18n.php b/functions/i18n.php
index 9d1f0f12a548362d2a3c2e983633a3c6082a5585..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)";
@@ -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/");

diff --git a/functions/page_header.php b/functions/page_header.php
index 4684a95baa5b00fa40f6be0e1f5f4b2955573a80..3aeae3363c5f490d56f3852274fa689069bd36e5 100644 (file)
--- a/functions/page_header.php
+++ b/functions/page_header.php
@@ -92,7 +92,7 @@
       do_hook("menuline");
 
       echo "      </TD><TD ALIGN=right nowrap WIDTH=\"1%\">\n";
-      echo "         <A HREF=\"http://www.squirrelmail.org/index.php3?from=1\" TARGET=\"_top\">SquirrelMail</A>\n";
+      echo "         <A HREF=\"http://www.squirrelmail.org/\" TARGET=\"_top\">SquirrelMail</A>\n";
       echo "      </TD>\n";
       echo "   </TR>\n";
       echo "</TABLE>\n\n";