Reinstating fix for the "to" addresses. Hopefully won't need them for CC

[squirrelmail.git] / functions / i18n.php

diff --git a/functions/i18n.php b/functions/i18n.php
index d5672e922d142a42af68d9763fe3da2e514f313f..18a5319c9faf00b20867310c4917353af654031b 100644 (file)
--- a/functions/i18n.php
+++ b/functions/i18n.php
@@ -9,45 +9,70 @@
  ** Internally the output character set is used. Other characters are
  ** encoded using Unicode entities according to HTML 4.0.
  **
+ ** $Id$
  **/
 
    $i18n_php = true;
+   if (! isset($squirrelmail_language)) { $squirrelmail_language = ""; }
 
    // 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)";
-   $languages["no_NO_ny"]["CHARSET"] = "iso-8859-1";
+   $languages["en"]["CHARSET"] = "iso-8859-1";
+   
+   $languages["ca"]["NAME"]    = "Catalan";
+   $languages["ca"]["CHARSET"] = "iso-8859-1";
+
+   $languages["cs_CZ"]["NAME"]    = "Czech";
+   $languages["cs_CZ"]["CHARSET"] = "iso-8859-2";
+   
+   $languages["da"]["NAME"]    = "Danish";
+   $languages["da"]["CHARSET"] = "iso-8859-1";
+   
    $languages["de"]["NAME"]    = "Deutsch";
    $languages["de"]["CHARSET"] = "iso-8859-1";
-   $languages["ru"]["NAME"]    = "Russian KOI8-R";
-   $languages["ru"]["CHARSET"] = "koi8-r";
-   $languages["pl"]["NAME"]    = "Polish";
-   $languages["pl"]["CHARSET"] = "iso-8859-2";
-   $languages["sv"]["NAME"]    = "Swedish";
-   $languages["sv"]["CHARSET"] = "iso-8859-1";
+   
    $languages["nl"]["NAME"]    = "Dutch";
    $languages["nl"]["CHARSET"] = "iso-8859-1";
-   $languages["pt_BR"]["NAME"] = "Portuguese (Brazil)";
-   $languages["pt_BR"]["CHARSET"] = "iso-8859-1";
+   
    $languages["fr"]["NAME"]    = "French";
    $languages["fr"]["CHARSET"] = "iso-8859-1";
+   
+   $languages["fi"]["NAME"] = "Finnish";
+   $languages["fi"]["CHARSET"] = "iso-8859-1";
+
    $languages["it"]["NAME"]    = "Italian";
    $languages["it"]["CHARSET"] = "iso-8859-1";
-   $languages["cs_CZ"]["NAME"]    = "Czech";
-   $languages["cs_CZ"]["CHARSET"] = "iso-8859-2";
-   $languages["es"]["NAME"]    = "Spanish";
-   $languages["es"]["CHARSET"] = "iso-8859-1";
+   
    $languages["ko"]["NAME"]    = "Korean";
    $languages["ko"]["CHARSET"] = "euc-KR";
-   $languages["ca"]["NAME"]    = "Catalan";
-   $languages["ca"]["CHARSET"] = "iso-8859-1";
-       $languages["sr"]["NAME"]         = "Serbian";
-       $languages["sr"]["CHARSET"] = "iso-8859-2";
-       $languages["tw"]["NAME"]    = "Taiwan";
-       $languages["tw"]["CHARSET"] = "big5";
+   
+   $languages["no"]["NAME"]    = "Norwegian (Bokmål)";
+   $languages["no"]["CHARSET"] = "iso-8859-1";
+   
+   $languages["no_NO_ny"]["NAME"] = "Norwegian (Nynorsk)";
+   $languages["no_NO_ny"]["CHARSET"] = "iso-8859-1";
+   
+   $languages["pl"]["NAME"]    = "Polish";
+   $languages["pl"]["CHARSET"] = "iso-8859-2";
+   
+   $languages["pt_BR"]["NAME"] = "Portuguese (Brazil)";
+   $languages["pt_BR"]["CHARSET"] = "iso-8859-1";
+   
+   $languages["ru"]["NAME"]    = "Russian KOI8-R";
+   $languages["ru"]["CHARSET"] = "koi8-r";
+   
+   $languages["sr"]["NAME"]     = "Serbian";
+   $languages["sr"]["CHARSET"] = "iso-8859-2";
+   
+   $languages["es"]["NAME"]    = "Spanish";
+   $languages["es"]["CHARSET"] = "iso-8859-1";
+   
+   $languages["sv"]["NAME"]    = "Swedish";
+   $languages["sv"]["CHARSET"] = "iso-8859-1";
+   
+   $languages["tw"]["NAME"]    = "Taiwan";
+   $languages["tw"]["CHARSET"] = "big5";
+   
 
    // Decodes a string to the internal encoding from the given charset
    function charset_decode ($charset, $string) {
@@ -739,7 +764,9 @@
       if (isset($sm_language) && $use_gettext &&
          $squirrelmail_language != "" &&
          $languages[$sm_language]["CHARSET"]) {
-         putenv("LC_ALL=".$sm_language);
+         if (ini_get("safe_mode")==FALSE && getenv("LC_ALL")!=$sm_language) {
+            putenv("LC_ALL=".$sm_language);
+         }
          setlocale("LC_ALL", $sm_language);
          bindtextdomain("squirrelmail", "../locale/");
          textdomain("squirrelmail");