Fix broken subject line that I doubt has worked since we went rg=0

[squirrelmail.git] / functions / i18n.php

diff --git a/functions/i18n.php b/functions/i18n.php
index 3591d450b992b58477ce3aae6c45c1616818bf42..cc9e3f9d3e00e9c540c24773d31b20e88bf7784c 100644 (file)
--- a/functions/i18n.php
+++ b/functions/i18n.php
@@ -25,7 +25,13 @@ function charset_decode ($charset, $string) {
     }
 
     /* All HTML special characters are 7 bit and can be replaced first */
-    $string = htmlspecialchars ($string);
+    
+    /* NOTE Marc Groot Koerkamp: This is the wrong place to do 
+       htmlspecialchars, It should be done before the echo.
+       By doing it here we get double htmlspecialchars calls which translates
+        < => &lt; => &amp;lt;
+    */
+    //$string = htmlspecialchars ($string);
 
     $charset = strtolower($charset);
 
@@ -1349,11 +1355,14 @@ $languages['ar']['NAME']    = 'Arabic';
 $languages['ar']['CHARSET'] = 'windows-1256';
 $languages['ar']['DIR']     = 'rtl';
 
-$languages['he_HE']['NAME']    = 'Hebrew';
-$languages['he_HE']['CHARSET'] = 'windows-1255';
-$languages['he_HE']['DIR']     = 'rtl';
-$languages['he']['ALIAS']      = 'he_HE';
+$languages['he_IL']['NAME']    = 'Hebrew';
+$languages['he_IL']['CHARSET'] = 'windows-1255';
+$languages['he_IL']['DIR']     = 'rtl';
+$languages['he']['ALIAS']      = 'he_IL';
 
+$languages['vi_VN']['NAME']    = 'Vietnamese';
+$languages['vi_VN']['CHARSET'] = 'utf-8';
+$languages['vi']['ALIAS'] = 'vi_VN';
 
 /* Detect whether gettext is installed. */
 $gettext_flags = 0;