X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=functions%2Fi18n.php;h=2ce457b1f144020b2dfb771ae0a6f10a29749d50;hb=cb48c2455cde2cf6ba67944c45decc4eca7df306;hp=8c0728ec7d3f7e08d73d4aae2e147bb5a01c7de0;hpb=ebab5342942eceb498319c31a07fc58db78585e1;p=squirrelmail.git

diff --git a/functions/i18n.php b/functions/i18n.php
index 8c0728ec..2ce457b1 100644
--- a/functions/i18n.php
+++ b/functions/i18n.php
@@ -1,84 +1,150 @@
 <?php
 
-/**
- ** i18n.php
- ** 
- ** This file contains variuos functions that are needed to do
- ** internationalization of SquirrelMail.
- **
- ** Internally the output character set is used. Other characters are
- ** encoded using Unicode entities according to HTML 4.0.
- **
- ** $Id$
- **/
-
-   $i18n_php = true;
+   /**
+    *  i18n.php
+    *
+    *   Copyright (c) 1999-2001 The Squirrelmail Development Team
+    *   Licensed under the GNU GPL. For full terms see the file COPYING.
+    *
+    *  This file contains variuos functions that are needed to do
+    *  internationalization of SquirrelMail.
+    *
+    *  Internally the output character set is used. Other characters are
+    *  encoded using Unicode entities according to HTML 4.0.
+    *
+    *  $Id$
+    */
+
+   global $squirrelmail_language, $languages;
    if (! isset($squirrelmail_language)) { $squirrelmail_language = ''; }
 
    // This array specifies the available languages.
-   $languages['en']['NAME']    = 'English';
-   $languages['en']['CHARSET'] = 'iso-8859-1';
-   
    $languages['ca']['NAME']    = 'Catalan';
    $languages['ca']['CHARSET'] = 'iso-8859-1';
+   $languages['ca_CA']['ALIAS'] = 'ca';
 
+   /* PLEASE DON'T TOUCH!!!
+    * Correct locale name, which should be set by setlocale and/or putenv('LC_ALL='...)
+    * is 'cs_CZ' and NOT 'cs', this applies to all locale names, look into docs, if you
+    * don't believe me.  Ondrej Sury, czech and slovak translator.
+    */
    $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';
+   $languages['da_DA']['ALIAS'] = 'da';
    
    $languages['de']['NAME']    = 'Deutsch';
    $languages['de']['CHARSET'] = 'iso-8859-1';
+   $languages['de_DE']['ALIAS'] = 'de';
    
-   $languages['nl']['NAME']    = 'Dutch';
-   $languages['nl']['CHARSET'] = 'iso-8859-1';
+   $languages['en']['NAME']    = 'English';
+   $languages['en']['CHARSET'] = 'iso-8859-1';
+   $languages['en_EN']['ALIAS'] = 'en';
    
+   $languages['es']['NAME']    = 'Spanish';
+   $languages['es']['CHARSET'] = 'iso-8859-1';
+   $languages['es_ES']['ALIAS'] = 'es';
+
+   $languages['et']['NAME']    = 'Estonian';
+   $languages['et']['CHARSET'] = 'iso-8859-15';
+   $languages['et_EE']['ALIAS'] = 'et';
+
+   $languages['fi']['NAME']    = 'Finnish';
+   $languages['fi']['CHARSET'] = 'iso-8859-1';
+   $languages['fi_FI']['ALIAS'] = 'fi';
+
    $languages['fr']['NAME']    = 'French';
    $languages['fr']['CHARSET'] = 'iso-8859-1';
+   $languages['fr_FR']['ALIAS'] = 'fr';
    
-   $languages['fi']['NAME']    = 'Finnish';
-   $languages['fi']['CHARSET'] = 'iso-8859-1';
+   $languages['hr']['NAME']    = 'Croatian';
+   $languages['hr']['CHARSET'] = 'iso-8859-2';
+   $languages['hr_HR']['ALIAS'] = 'hr';
 
    $languages['hu']['NAME']    = 'Hungarian';
-   $languages['hu']['CHARSET'] = 'iso-8859-1';
+   $languages['hu']['CHARSET'] = 'iso-8859-2';
+   $languages['hu_HU']['ALIAS'] = 'hu';
 
+   $languages['id']['NAME']    = 'Indonesian';
+   $languages['id']['CHARSET'] = 'iso-8859-1';
+   $languages['id_ID']['ALIAS'] = 'id';
+   
    $languages['is']['NAME']    = 'Icelandic';
    $languages['is']['CHARSET'] = 'iso-8859-1';
+   $languages['is_IS']['ALIAS'] = 'is';
    
    $languages['it']['NAME']    = 'Italian';
    $languages['it']['CHARSET'] = 'iso-8859-1';
+   $languages['it_IT']['ALIAS'] = 'it';
   
    $languages['ko']['NAME']    = 'Korean';
    $languages['ko']['CHARSET'] = 'euc-KR';
+   $languages['ko_KO']['ALIAS'] = 'ko';
+   
+   $languages['nl']['NAME']    = 'Dutch';
+   $languages['nl']['CHARSET'] = 'iso-8859-1';
+   $languages['nl_NL']['ALIAS'] = 'nl';
    
    $languages['no']['NAME']    = 'Norwegian (Bokm&aring;l)';
    $languages['no']['CHARSET'] = 'iso-8859-1';
-   
+   $languages['no_NO']['ALIAS'] = 'no';
    $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['pl_PL']['ALIAS'] = 'pl';
    
+   $languages['pt']['NAME'] = 'Português (Portugal)';
+   $languages['pt']['CHARSET'] = 'iso-8859-1';
    $languages['pt_BR']['NAME']    = 'Portuguese (Brazil)';
    $languages['pt_BR']['CHARSET'] = 'iso-8859-1';
+   $languages['pt_PT']['ALIAS'] = 'pt';
    
    $languages['ru']['NAME']    = 'Russian KOI8-R';
    $languages['ru']['CHARSET'] = 'koi8-r';
+   $languages['ru_RU']['ALIAS'] = 'ru';
    
    $languages['sr']['NAME']    = 'Serbian';
    $languages['sr']['CHARSET'] = 'iso-8859-2';
+   $languages['sr_SR']['ALIAS'] = 'sr';
    
-   $languages['es']['NAME']    = 'Spanish';
-   $languages['es']['CHARSET'] = 'iso-8859-1';
-
    $languages['sv']['NAME']    = 'Swedish';
    $languages['sv']['CHARSET'] = 'iso-8859-1';
+   $languages['sv_SV']['ALIAS'] = 'sv';
+   
+   $languages['tr']['NAME']    = 'Turkish';
+   $languages['tr']['CHARSET'] = 'iso-8859-9';
+   $languages['tr_TR']['ALIAS'] = 'tr';
    
    $languages['tw']['NAME']    = 'Taiwan';
    $languages['tw']['CHARSET'] = 'big5';
+   $languages['tw_TW']['ALIAS'] = 'tw';
+   
+   $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';
+   $languages['ro_RO']['ALIAS'] = 'ro';
+
+   $languages['th']['NAME']    = 'Thai';
+   $languages['th']['CHARSET'] = 'tis-620';
+
+   $languages['lt']['NAME']    = 'Lithuanian';
+   $languages['lt']['CHARSET'] = 'iso-8859-13';
+   $languages['lt_LT']['ALIAS'] = 'lt';
+
+   $languages['sl']['NAME']    = 'Slovenian';
+   $languages['sl']['CHARSET'] = 'iso-8859-2';
+
+   $languages['bg']['NAME']    = 'Bulgarian';
+   $languages['bg']['CHARSET'] = 'iso-8859-1';
 
    // Decodes a string to the internal encoding from the given charset
    function charset_decode ($charset, $string) {
@@ -106,6 +172,8 @@
          return charset_decode_ns_4551_1 ($string);
       } else if ($charset == 'koi8-r') {
         return charset_decode_koi8r ($string);
+      } else if ($charset == 'windows-1251') {
+        return charset_decode_koi8r ($string);
       } else
          return $string;
    }
@@ -257,205 +325,206 @@
    function charset_decode_iso_8859_2 ($string) {
       global $default_charset;
 
-      if (strtolower($default_charset) == 'iso-8859-2') {
+      if (strtolower($default_charset) == 'iso-8859-2')
          return $string;
-      } else {
-         // Only do the slow convert if there are 8-bit characters
-         if (ereg("[\200-\377]", $string)) {
-            // NO-BREAK SPACE
-            $string = str_replace("\240", '&#160;', $string);
-            // LATIN CAPITAL LETTER A WITH OGONEK
-            $string = str_replace("\241", '&#260;', $string);
-            // BREVE
-            $string = str_replace("\242", '&#728;', $string);
-            // LATIN CAPITAL LETTER L WITH STROKE
-            $string = str_replace("\243", '&#321;', $string);
-            // CURRENCY SIGN
-            $string = str_replace("\244", '&#164;', $string);
-            // LATIN CAPITAL LETTER L WITH CARON
-            $string = str_replace("\245", '&#317;', $string);
-            // LATIN CAPITAL LETTER S WITH ACUTE
-            $string = str_replace("\246", '&#346;', $string);
-            // SECTION SIGN
-            $string = str_replace("\247", '&#167;', $string);
-            // DIAERESIS
-            $string = str_replace("\250", '&#168;', $string);
-            // LATIN CAPITAL LETTER S WITH CARON
-            $string = str_replace("\251", '&#352;', $string);
-            // LATIN CAPITAL LETTER S WITH CEDILLA
-            $string = str_replace("\252", '&#350;', $string);
-            // LATIN CAPITAL LETTER T WITH CARON
-            $string = str_replace("\253", '&#356;', $string);
-            // LATIN CAPITAL LETTER Z WITH ACUTE
-            $string = str_replace("\254", '&#377;', $string);
-            // SOFT HYPHEN
-            $string = str_replace("\255", '&#173;', $string);
-            // LATIN CAPITAL LETTER Z WITH CARON
-            $string = str_replace("\256", '&#381;', $string);
-            // LATIN CAPITAL LETTER Z WITH DOT ABOVE
-            $string = str_replace("\257", '&#379;', $string);
-            // DEGREE SIGN
-            $string = str_replace("\260", '&#176;', $string);
-            // LATIN SMALL LETTER A WITH OGONEK
-            $string = str_replace("\261", '&#261;', $string);
-            // OGONEK
-            $string = str_replace("\262", '&#731;', $string);
-            // LATIN SMALL LETTER L WITH STROKE
-            $string = str_replace("\263", '&#322;', $string);
-            // ACUTE ACCENT
-            $string = str_replace("\264", '&#180;', $string);
-            // LATIN SMALL LETTER L WITH CARON
-            $string = str_replace("\265", '&#318;', $string);
-            // LATIN SMALL LETTER S WITH ACUTE
-            $string = str_replace("\266", '&#347;', $string);
-            // CARON
-            $string = str_replace("\267", '&#711;', $string);
-            // CEDILLA
-            $string = str_replace("\270", '&#184;', $string);
-            // LATIN SMALL LETTER S WITH CARON
-            $string = str_replace("\271", '&#353;', $string);
-            // LATIN SMALL LETTER S WITH CEDILLA
-            $string = str_replace("\272", '&#351;', $string);
-            // LATIN SMALL LETTER T WITH CARON
-            $string = str_replace("\273", '&#357;', $string);
-            // LATIN SMALL LETTER Z WITH ACUTE
-            $string = str_replace("\274", '&#378;', $string);
-            // DOUBLE ACUTE ACCENT
-            $string = str_replace("\275", '&#733;', $string);
-            // LATIN SMALL LETTER Z WITH CARON
-            $string = str_replace("\276", '&#382;', $string);
-            // LATIN SMALL LETTER Z WITH DOT ABOVE
-            $string = str_replace("\277", '&#380;', $string);
-            // LATIN CAPITAL LETTER R WITH ACUTE
-            $string = str_replace("\300", '&#340;', $string);
-            // LATIN CAPITAL LETTER A WITH ACUTE
-            $string = str_replace("\301", '&#193;', $string);
-            // LATIN CAPITAL LETTER A WITH CIRCUMFLEX
-            $string = str_replace("\302", '&#194;', $string);
-            // LATIN CAPITAL LETTER A WITH BREVE
-            $string = str_replace("\303", '&#258;', $string);
-            // LATIN CAPITAL LETTER A WITH DIAERESIS
-            $string = str_replace("\304", '&#196;', $string);
-            // LATIN CAPITAL LETTER L WITH ACUTE
-            $string = str_replace("\305", '&#313;', $string);
-            // LATIN CAPITAL LETTER C WITH ACUTE
-            $string = str_replace("\306", '&#262;', $string);
-            // LATIN CAPITAL LETTER C WITH CEDILLA
-            $string = str_replace("\307", '&#199;', $string);
-            // LATIN CAPITAL LETTER C WITH CARON
-            $string = str_replace("\310", '&#268;', $string);
-            // LATIN CAPITAL LETTER E WITH ACUTE
-            $string = str_replace("\311", '&#201;', $string);
-            // LATIN CAPITAL LETTER E WITH OGONEK
-            $string = str_replace("\312", '&#280;', $string);
-            // LATIN CAPITAL LETTER E WITH DIAERESIS
-            $string = str_replace("\313", '&#203;', $string);
-            // LATIN CAPITAL LETTER E WITH CARON
-            $string = str_replace("\314", '&#282;', $string);
-            // LATIN CAPITAL LETTER I WITH ACUTE
-            $string = str_replace("\315", '&#205;', $string);
-            // LATIN CAPITAL LETTER I WITH CIRCUMFLEX
-            $string = str_replace("\316", '&#206;', $string);
-            // LATIN CAPITAL LETTER D WITH CARON
-            $string = str_replace("\317", '&#270;', $string);
-            // LATIN CAPITAL LETTER D WITH STROKE
-            $string = str_replace("\320", '&#272;', $string);
-            // LATIN CAPITAL LETTER N WITH ACUTE
-            $string = str_replace("\321", '&#323;', $string);
-            // LATIN CAPITAL LETTER N WITH CARON
-            $string = str_replace("\322", '&#327;', $string);
-            // LATIN CAPITAL LETTER O WITH ACUTE
-            $string = str_replace("\323", '&#211;', $string);
-            // LATIN CAPITAL LETTER O WITH CIRCUMFLEX
-            $string = str_replace("\324", '&#212;', $string);
-            // LATIN CAPITAL LETTER O WITH DOUBLE ACUTE
-            $string = str_replace("\325", '&#336;', $string);
-            // LATIN CAPITAL LETTER O WITH DIAERESIS
-            $string = str_replace("\326", '&#214;', $string);
-            // MULTIPLICATION SIGN
-            $string = str_replace("\327", '&#215;', $string);
-            // LATIN CAPITAL LETTER R WITH CARON
-            $string = str_replace("\330", '&#344;', $string);
-            // LATIN CAPITAL LETTER U WITH RING ABOVE
-            $string = str_replace("\331", '&#366;', $string);
-            // LATIN CAPITAL LETTER U WITH ACUTE
-            $string = str_replace("\332", '&#218;', $string);
-            // LATIN CAPITAL LETTER U WITH DOUBLE ACUTE
-            $string = str_replace("\333", '&#368;', $string);
-            // LATIN CAPITAL LETTER U WITH DIAERESIS
-            $string = str_replace("\334", '&#220;', $string);
-            // LATIN CAPITAL LETTER Y WITH ACUTE
-            $string = str_replace("\335", '&#221;', $string);
-            // LATIN CAPITAL LETTER T WITH CEDILLA
-            $string = str_replace("\336", '&#354;', $string);
-            // LATIN SMALL LETTER SHARP S
-            $string = str_replace("\337", '&#223;', $string);
-            // LATIN SMALL LETTER R WITH ACUTE
-            $string = str_replace("\340", '&#341;', $string);
-            // LATIN SMALL LETTER A WITH ACUTE
-            $string = str_replace("\341", '&#225;', $string);
-            // LATIN SMALL LETTER A WITH CIRCUMFLEX
-            $string = str_replace("\342", '&#226;', $string);
-            // LATIN SMALL LETTER A WITH BREVE
-            $string = str_replace("\343", '&#259;', $string);
-            // LATIN SMALL LETTER A WITH DIAERESIS
-            $string = str_replace("\344", '&#228;', $string);
-            // LATIN SMALL LETTER L WITH ACUTE
-            $string = str_replace("\345", '&#314;', $string);
-            // LATIN SMALL LETTER C WITH ACUTE
-            $string = str_replace("\346", '&#263;', $string);
-            // LATIN SMALL LETTER C WITH CEDILLA
-            $string = str_replace("\347", '&#231;', $string);
-            // LATIN SMALL LETTER C WITH CARON
-            $string = str_replace("\350", '&#269;', $string);
-            // LATIN SMALL LETTER E WITH ACUTE
-            $string = str_replace("\351", '&#233;', $string);
-            // LATIN SMALL LETTER E WITH OGONEK
-            $string = str_replace("\352", '&#281;', $string);
-            // LATIN SMALL LETTER E WITH DIAERESIS
-            $string = str_replace("\353", '&#235;', $string);
-            // LATIN SMALL LETTER E WITH CARON
-            $string = str_replace("\354", '&#283;', $string);
-            // LATIN SMALL LETTER I WITH ACUTE
-            $string = str_replace("\355", '&#237;', $string);
-            // LATIN SMALL LETTER I WITH CIRCUMFLEX
-            $string = str_replace("\356", '&#238;', $string);
-            // LATIN SMALL LETTER D WITH CARON
-            $string = str_replace("\357", '&#271;', $string);
-            // LATIN SMALL LETTER D WITH STROKE
-            $string = str_replace("\360", '&#273;', $string);
-            // LATIN SMALL LETTER N WITH ACUTE
-            $string = str_replace("\361", '&#324;', $string);
-            // LATIN SMALL LETTER N WITH CARON
-            $string = str_replace("\362", '&#328;', $string);
-            // LATIN SMALL LETTER O WITH ACUTE
-            $string = str_replace("\363", '&#243;', $string);
-            // LATIN SMALL LETTER O WITH CIRCUMFLEX
-            $string = str_replace("\364", '&#244;', $string);
-            // LATIN SMALL LETTER O WITH DOUBLE ACUTE
-            $string = str_replace("\365", '&#337;', $string);
-            // LATIN SMALL LETTER O WITH DIAERESIS
-            $string = str_replace("\366", '&#246;', $string);
-            // DIVISION SIGN
-            $string = str_replace("\367", '&#247;', $string);
-            // LATIN SMALL LETTER R WITH CARON
-            $string = str_replace("\370", '&#345;', $string);
-            // LATIN SMALL LETTER U WITH RING ABOVE
-            $string = str_replace("\371", '&#367;', $string);
-            // LATIN SMALL LETTER U WITH ACUTE
-            $string = str_replace("\372", '&#250;', $string);
-            // LATIN SMALL LETTER U WITH DOUBLE ACUTE
-            $string = str_replace("\373", '&#369;', $string);
-            // LATIN SMALL LETTER U WITH DIAERESIS
-            $string = str_replace("\374", '&#252;', $string);
-            // LATIN SMALL LETTER Y WITH ACUTE
-            $string = str_replace("\375", '&#253;', $string);
-            // LATIN SMALL LETTER T WITH CEDILLA
-            $string = str_replace("\376", '&#355;', $string);
-            // DOT ABOVE
-            $string = str_replace("\377", '&#729;', $string);
-	 }
-      }
+     
+      // Only do the slow convert if there are 8-bit characters
+      if (! ereg("[\200-\377]", $string))
+         return $string;
+         
+      // NO-BREAK SPACE
+      $string = str_replace("\240", '&#160;', $string);
+      // LATIN CAPITAL LETTER A WITH OGONEK
+      $string = str_replace("\241", '&#260;', $string);
+      // BREVE
+      $string = str_replace("\242", '&#728;', $string);
+      // LATIN CAPITAL LETTER L WITH STROKE
+      $string = str_replace("\243", '&#321;', $string);
+      // CURRENCY SIGN
+      $string = str_replace("\244", '&#164;', $string);
+      // LATIN CAPITAL LETTER L WITH CARON
+      $string = str_replace("\245", '&#317;', $string);
+      // LATIN CAPITAL LETTER S WITH ACUTE
+      $string = str_replace("\246", '&#346;', $string);
+      // SECTION SIGN
+      $string = str_replace("\247", '&#167;', $string);
+      // DIAERESIS
+      $string = str_replace("\250", '&#168;', $string);
+      // LATIN CAPITAL LETTER S WITH CARON
+      $string = str_replace("\251", '&#352;', $string);
+      // LATIN CAPITAL LETTER S WITH CEDILLA
+      $string = str_replace("\252", '&#350;', $string);
+      // LATIN CAPITAL LETTER T WITH CARON
+      $string = str_replace("\253", '&#356;', $string);
+      // LATIN CAPITAL LETTER Z WITH ACUTE
+      $string = str_replace("\254", '&#377;', $string);
+      // SOFT HYPHEN
+      $string = str_replace("\255", '&#173;', $string);
+      // LATIN CAPITAL LETTER Z WITH CARON
+      $string = str_replace("\256", '&#381;', $string);
+      // LATIN CAPITAL LETTER Z WITH DOT ABOVE
+      $string = str_replace("\257", '&#379;', $string);
+      // DEGREE SIGN
+      $string = str_replace("\260", '&#176;', $string);
+      // LATIN SMALL LETTER A WITH OGONEK
+      $string = str_replace("\261", '&#261;', $string);
+      // OGONEK
+      $string = str_replace("\262", '&#731;', $string);
+      // LATIN SMALL LETTER L WITH STROKE
+      $string = str_replace("\263", '&#322;', $string);
+      // ACUTE ACCENT
+      $string = str_replace("\264", '&#180;', $string);
+      // LATIN SMALL LETTER L WITH CARON
+      $string = str_replace("\265", '&#318;', $string);
+      // LATIN SMALL LETTER S WITH ACUTE
+      $string = str_replace("\266", '&#347;', $string);
+      // CARON
+      $string = str_replace("\267", '&#711;', $string);
+      // CEDILLA
+      $string = str_replace("\270", '&#184;', $string);
+      // LATIN SMALL LETTER S WITH CARON
+      $string = str_replace("\271", '&#353;', $string);
+      // LATIN SMALL LETTER S WITH CEDILLA
+      $string = str_replace("\272", '&#351;', $string);
+      // LATIN SMALL LETTER T WITH CARON
+      $string = str_replace("\273", '&#357;', $string);
+      // LATIN SMALL LETTER Z WITH ACUTE
+      $string = str_replace("\274", '&#378;', $string);
+      // DOUBLE ACUTE ACCENT
+      $string = str_replace("\275", '&#733;', $string);
+      // LATIN SMALL LETTER Z WITH CARON
+      $string = str_replace("\276", '&#382;', $string);
+      // LATIN SMALL LETTER Z WITH DOT ABOVE
+      $string = str_replace("\277", '&#380;', $string);
+      // LATIN CAPITAL LETTER R WITH ACUTE
+      $string = str_replace("\300", '&#340;', $string);
+      // LATIN CAPITAL LETTER A WITH ACUTE
+      $string = str_replace("\301", '&#193;', $string);
+      // LATIN CAPITAL LETTER A WITH CIRCUMFLEX
+      $string = str_replace("\302", '&#194;', $string);
+      // LATIN CAPITAL LETTER A WITH BREVE
+      $string = str_replace("\303", '&#258;', $string);
+      // LATIN CAPITAL LETTER A WITH DIAERESIS
+      $string = str_replace("\304", '&#196;', $string);
+      // LATIN CAPITAL LETTER L WITH ACUTE
+      $string = str_replace("\305", '&#313;', $string);
+      // LATIN CAPITAL LETTER C WITH ACUTE
+      $string = str_replace("\306", '&#262;', $string);
+      // LATIN CAPITAL LETTER C WITH CEDILLA
+      $string = str_replace("\307", '&#199;', $string);
+      // LATIN CAPITAL LETTER C WITH CARON
+      $string = str_replace("\310", '&#268;', $string);
+      // LATIN CAPITAL LETTER E WITH ACUTE
+      $string = str_replace("\311", '&#201;', $string);
+      // LATIN CAPITAL LETTER E WITH OGONEK
+      $string = str_replace("\312", '&#280;', $string);
+      // LATIN CAPITAL LETTER E WITH DIAERESIS
+      $string = str_replace("\313", '&#203;', $string);
+      // LATIN CAPITAL LETTER E WITH CARON
+      $string = str_replace("\314", '&#282;', $string);
+      // LATIN CAPITAL LETTER I WITH ACUTE
+      $string = str_replace("\315", '&#205;', $string);
+      // LATIN CAPITAL LETTER I WITH CIRCUMFLEX
+      $string = str_replace("\316", '&#206;', $string);
+      // LATIN CAPITAL LETTER D WITH CARON
+      $string = str_replace("\317", '&#270;', $string);
+      // LATIN CAPITAL LETTER D WITH STROKE
+      $string = str_replace("\320", '&#272;', $string);
+      // LATIN CAPITAL LETTER N WITH ACUTE
+      $string = str_replace("\321", '&#323;', $string);
+      // LATIN CAPITAL LETTER N WITH CARON
+      $string = str_replace("\322", '&#327;', $string);
+      // LATIN CAPITAL LETTER O WITH ACUTE
+      $string = str_replace("\323", '&#211;', $string);
+      // LATIN CAPITAL LETTER O WITH CIRCUMFLEX
+      $string = str_replace("\324", '&#212;', $string);
+      // LATIN CAPITAL LETTER O WITH DOUBLE ACUTE
+      $string = str_replace("\325", '&#336;', $string);
+      // LATIN CAPITAL LETTER O WITH DIAERESIS
+      $string = str_replace("\326", '&#214;', $string);
+      // MULTIPLICATION SIGN
+      $string = str_replace("\327", '&#215;', $string);
+      // LATIN CAPITAL LETTER R WITH CARON
+      $string = str_replace("\330", '&#344;', $string);
+      // LATIN CAPITAL LETTER U WITH RING ABOVE
+      $string = str_replace("\331", '&#366;', $string);
+      // LATIN CAPITAL LETTER U WITH ACUTE
+      $string = str_replace("\332", '&#218;', $string);
+      // LATIN CAPITAL LETTER U WITH DOUBLE ACUTE
+      $string = str_replace("\333", '&#368;', $string);
+      // LATIN CAPITAL LETTER U WITH DIAERESIS
+      $string = str_replace("\334", '&#220;', $string);
+      // LATIN CAPITAL LETTER Y WITH ACUTE
+      $string = str_replace("\335", '&#221;', $string);
+      // LATIN CAPITAL LETTER T WITH CEDILLA
+      $string = str_replace("\336", '&#354;', $string);
+      // LATIN SMALL LETTER SHARP S
+      $string = str_replace("\337", '&#223;', $string);
+      // LATIN SMALL LETTER R WITH ACUTE
+      $string = str_replace("\340", '&#341;', $string);
+      // LATIN SMALL LETTER A WITH ACUTE
+      $string = str_replace("\341", '&#225;', $string);
+      // LATIN SMALL LETTER A WITH CIRCUMFLEX
+      $string = str_replace("\342", '&#226;', $string);
+      // LATIN SMALL LETTER A WITH BREVE
+      $string = str_replace("\343", '&#259;', $string);
+      // LATIN SMALL LETTER A WITH DIAERESIS
+      $string = str_replace("\344", '&#228;', $string);
+      // LATIN SMALL LETTER L WITH ACUTE
+      $string = str_replace("\345", '&#314;', $string);
+      // LATIN SMALL LETTER C WITH ACUTE
+      $string = str_replace("\346", '&#263;', $string);
+      // LATIN SMALL LETTER C WITH CEDILLA
+      $string = str_replace("\347", '&#231;', $string);
+      // LATIN SMALL LETTER C WITH CARON
+      $string = str_replace("\350", '&#269;', $string);
+      // LATIN SMALL LETTER E WITH ACUTE
+      $string = str_replace("\351", '&#233;', $string);
+      // LATIN SMALL LETTER E WITH OGONEK
+      $string = str_replace("\352", '&#281;', $string);
+      // LATIN SMALL LETTER E WITH DIAERESIS
+      $string = str_replace("\353", '&#235;', $string);
+      // LATIN SMALL LETTER E WITH CARON
+      $string = str_replace("\354", '&#283;', $string);
+      // LATIN SMALL LETTER I WITH ACUTE
+      $string = str_replace("\355", '&#237;', $string);
+      // LATIN SMALL LETTER I WITH CIRCUMFLEX
+      $string = str_replace("\356", '&#238;', $string);
+      // LATIN SMALL LETTER D WITH CARON
+      $string = str_replace("\357", '&#271;', $string);
+      // LATIN SMALL LETTER D WITH STROKE
+      $string = str_replace("\360", '&#273;', $string);
+      // LATIN SMALL LETTER N WITH ACUTE
+      $string = str_replace("\361", '&#324;', $string);
+      // LATIN SMALL LETTER N WITH CARON
+      $string = str_replace("\362", '&#328;', $string);
+      // LATIN SMALL LETTER O WITH ACUTE
+      $string = str_replace("\363", '&#243;', $string);
+      // LATIN SMALL LETTER O WITH CIRCUMFLEX
+      $string = str_replace("\364", '&#244;', $string);
+      // LATIN SMALL LETTER O WITH DOUBLE ACUTE
+      $string = str_replace("\365", '&#337;', $string);
+      // LATIN SMALL LETTER O WITH DIAERESIS
+      $string = str_replace("\366", '&#246;', $string);
+      // DIVISION SIGN
+      $string = str_replace("\367", '&#247;', $string);
+      // LATIN SMALL LETTER R WITH CARON
+      $string = str_replace("\370", '&#345;', $string);
+      // LATIN SMALL LETTER U WITH RING ABOVE
+      $string = str_replace("\371", '&#367;', $string);
+      // LATIN SMALL LETTER U WITH ACUTE
+      $string = str_replace("\372", '&#250;', $string);
+      // LATIN SMALL LETTER U WITH DOUBLE ACUTE
+      $string = str_replace("\373", '&#369;', $string);
+      // LATIN SMALL LETTER U WITH DIAERESIS
+      $string = str_replace("\374", '&#252;', $string);
+      // LATIN SMALL LETTER Y WITH ACUTE
+      $string = str_replace("\375", '&#253;', $string);
+      // LATIN SMALL LETTER T WITH CEDILLA
+      $string = str_replace("\376", '&#355;', $string);
+      // DOT ABOVE
+      $string = str_replace("\377", '&#729;', $string);
+
       return $string;
    }
 
@@ -463,59 +532,59 @@
    function charset_decode_iso_8859_7 ($string) {
       global $default_charset;
 
-      if (strtolower($default_charset) == 'iso-8859-7') {
+      if (strtolower($default_charset) == 'iso-8859-7')
          return $string;
-      } else { 
-         // Only do the slow convert if there are 8-bit characters
-         if (ereg("[\200-\377]", $string)) {
-            // Some diverse characters in the beginning
-            $string = str_replace("\240", '&#160;', $string);
-            $string = str_replace("\241", '&#8216;', $string);
-            $string = str_replace("\242", '&#8217;', $string);
-            $string = str_replace("\243", '&#163;', $string);
-            $string = str_replace("\246", '&#166;', $string);
-            $string = str_replace("\247", '&#167;', $string);
-            $string = str_replace("\250", '&#168;', $string);
-            $string = str_replace("\251", '&#169;', $string);
-            $string = str_replace("\253", '&#171;', $string);
-            $string = str_replace("\254", '&#172;', $string);
-            $string = str_replace("\255", '&#173;', $string);
-            $string = str_replace("\257", '&#8213;', $string);
-            $string = str_replace("\260", '&#176;', $string);
-            $string = str_replace("\261", '&#177;', $string);
-            $string = str_replace("\262", '&#178;', $string);
-            $string = str_replace("\263", '&#179;', $string);
-         
-            // Horizontal bar (parentheki pavla)
-            $string = str_replace ("\257", '&#8213;', $string);
          
-            // ISO-8859-7 characters from 11/04 (0xB4) to 11/06 (0xB6)
-            // These are Unicode 900-902
-            while (ereg("([\264-\266])", $string, $res)) {
-               $replace = '&#' . (ord($res[1])+720) . ';';
-               $string = str_replace($res[1], $replace, $string);
-            }
+      // Only do the slow convert if there are 8-bit characters
+      if (!ereg("[\200-\377]", $string))
+         return $string;
          
-            // 11/07 (0xB7) Middle dot is the same in iso-8859-1
-            $string = str_replace("\267", '&#183;', $string);
+      // Some diverse characters in the beginning
+      $string = str_replace("\240", '&#160;', $string);
+      $string = str_replace("\241", '&#8216;', $string);
+      $string = str_replace("\242", '&#8217;', $string);
+      $string = str_replace("\243", '&#163;', $string);
+      $string = str_replace("\246", '&#166;', $string);
+      $string = str_replace("\247", '&#167;', $string);
+      $string = str_replace("\250", '&#168;', $string);
+      $string = str_replace("\251", '&#169;', $string);
+      $string = str_replace("\253", '&#171;', $string);
+      $string = str_replace("\254", '&#172;', $string);
+      $string = str_replace("\255", '&#173;', $string);
+      $string = str_replace("\257", '&#8213;', $string);
+      $string = str_replace("\260", '&#176;', $string);
+      $string = str_replace("\261", '&#177;', $string);
+      $string = str_replace("\262", '&#178;', $string);
+      $string = str_replace("\263", '&#179;', $string);
+      
+      // Horizontal bar (parentheki pavla)
+      $string = str_replace ("\257", '&#8213;', $string);
+      
+      // ISO-8859-7 characters from 11/04 (0xB4) to 11/06 (0xB6)
+      // These are Unicode 900-902
+      while (ereg("([\264-\266])", $string, $res)) {
+         $replace = '&#' . (ord($res[1])+720) . ';';
+         $string = str_replace($res[1], $replace, $string);
+      }
          
-            // ISO-8859-7 characters from 11/08 (0xB8) to 11/10 (0xBA)
-            // These are Unicode 900-902
-            while (ereg("([\270-\272])", $string, $res)) {
-               $replace = '&#' . (ord($res[1])+720) . ";";
-               $string = str_replace($res[1], $replace, $string);
-            }
+      // 11/07 (0xB7) Middle dot is the same in iso-8859-1
+      $string = str_replace("\267", '&#183;', $string);
+      
+      // ISO-8859-7 characters from 11/08 (0xB8) to 11/10 (0xBA)
+      // These are Unicode 900-902
+      while (ereg("([\270-\272])", $string, $res)) {
+         $replace = '&#' . (ord($res[1])+720) . ";";
+         $string = str_replace($res[1], $replace, $string);
+      }
          
-            // 11/11 (0xBB) Right angle quotation mark is the same as in
-            // iso-8859-1
-            $string = str_replace("\273", '&#187;', $string);
+      // 11/11 (0xBB) Right angle quotation mark is the same as in
+      // iso-8859-1
+      $string = str_replace("\273", '&#187;', $string);
          
-            // And now the rest of the charset
-            while (ereg("([\274-\376])", $string, $res)) {
-               $replace = '&#' . (ord($res[1])+720) . ';';
-               $string = str_replace($res[1], $replace, $string);
-            }
-         }
+      // And now the rest of the charset
+      while (ereg("([\274-\376])", $string, $res)) {
+         $replace = '&#' . (ord($res[1])+720) . ';';
+         $string = str_replace($res[1], $replace, $string);
       }
 
       return $string;
@@ -588,179 +657,185 @@
    function charset_decode_koi8r ($string) {
       global $default_charset;
 
-      if ($default_charset == 'koi8-r') {
-         return $string;
-      } else { 
-         // Convert to Unicode HTML entities.
-         // This code is rather ineffective.
-         $string = str_replace("\200", '&#9472;', $string);
-         $string = str_replace("\201", '&#9474;', $string);
-         $string = str_replace("\202", '&#9484;', $string);
-         $string = str_replace("\203", '&#9488;', $string);
-         $string = str_replace("\204", '&#9492;', $string);
-         $string = str_replace("\205", '&#9496;', $string);
-         $string = str_replace("\206", '&#9500;', $string);
-         $string = str_replace("\207", '&#9508;', $string);
-         $string = str_replace("\210", '&#9516;', $string);
-         $string = str_replace("\211", '&#9524;', $string);
-         $string = str_replace("\212", '&#9532;', $string);
-         $string = str_replace("\213", '&#9600;', $string);
-         $string = str_replace("\214", '&#9604;', $string);
-         $string = str_replace("\215", '&#9608;', $string);
-         $string = str_replace("\216", '&#9612;', $string);
-         $string = str_replace("\217", '&#9616;', $string);
-         $string = str_replace("\220", '&#9617;', $string);
-         $string = str_replace("\221", '&#9618;', $string);
-         $string = str_replace("\222", '&#9619;', $string);
-         $string = str_replace("\223", '&#8992;', $string);
-         $string = str_replace("\224", '&#9632;', $string);
-         $string = str_replace("\225", '&#8729;', $string);
-         $string = str_replace("\226", '&#8730;', $string);
-         $string = str_replace("\227", '&#8776;', $string);
-         $string = str_replace("\230", '&#8804;', $string);
-         $string = str_replace("\231", '&#8805;', $string);
-         $string = str_replace("\232", '&#160;', $string);
-         $string = str_replace("\233", '&#8993;', $string);
-         $string = str_replace("\234", '&#176;', $string);
-         $string = str_replace("\235", '&#178;', $string);
-         $string = str_replace("\236", '&#183;', $string);
-         $string = str_replace("\237", '&#247;', $string);
-         $string = str_replace("\240", '&#9552;', $string);
-         $string = str_replace("\241", '&#9553;', $string);
-         $string = str_replace("\242", '&#9554;', $string);
-         $string = str_replace("\243", '&#1105;', $string);
-         $string = str_replace("\244", '&#9555;', $string);
-         $string = str_replace("\245", '&#9556;', $string);
-         $string = str_replace("\246", '&#9557;', $string);
-         $string = str_replace("\247", '&#9558;', $string);
-         $string = str_replace("\250", '&#9559;', $string);
-         $string = str_replace("\251", '&#9560;', $string);
-         $string = str_replace("\252", '&#9561;', $string);
-         $string = str_replace("\253", '&#9562;', $string);
-         $string = str_replace("\254", '&#9563;', $string);
-         $string = str_replace("\255", '&#9564;', $string);
-         $string = str_replace("\256", '&#9565;', $string);
-         $string = str_replace("\257", '&#9566;', $string);
-         $string = str_replace("\260", '&#9567;', $string);
-         $string = str_replace("\261", '&#9568;', $string);
-         $string = str_replace("\262", '&#9569;', $string);
-         $string = str_replace("\263", '&#1025;', $string);
-         $string = str_replace("\264", '&#9570;', $string);
-         $string = str_replace("\265", '&#9571;', $string);
-         $string = str_replace("\266", '&#9572;', $string);
-         $string = str_replace("\267", '&#9573;', $string);
-         $string = str_replace("\270", '&#9574;', $string);
-         $string = str_replace("\271", '&#9575;', $string);
-         $string = str_replace("\272", '&#9576;', $string);
-         $string = str_replace("\273", '&#9577;', $string);
-         $string = str_replace("\274", '&#9578;', $string);
-         $string = str_replace("\275", '&#9579;', $string);
-         $string = str_replace("\276", '&#9580;', $string);
-         $string = str_replace("\277", '&#169;', $string);
-         $string = str_replace("\300", '&#1102;', $string);
-         $string = str_replace("\301", '&#1072;', $string);
-         $string = str_replace("\302", '&#1073;', $string);
-         $string = str_replace("\303", '&#1094;', $string);
-         $string = str_replace("\304", '&#1076;', $string);
-         $string = str_replace("\305", '&#1077;', $string);
-         $string = str_replace("\306", '&#1092;', $string);
-         $string = str_replace("\307", '&#1075;', $string);
-         $string = str_replace("\310", '&#1093;', $string);
-         $string = str_replace("\311", '&#1080;', $string);
-         $string = str_replace("\312", '&#1081;', $string);
-         $string = str_replace("\313", '&#1082;', $string);
-         $string = str_replace("\314", '&#1083;', $string);
-         $string = str_replace("\315", '&#1084;', $string);
-         $string = str_replace("\316", '&#1085;', $string);
-         $string = str_replace("\317", '&#1086;', $string);
-         $string = str_replace("\320", '&#1087;', $string);
-         $string = str_replace("\321", '&#1103;', $string);
-         $string = str_replace("\322", '&#1088;', $string);
-         $string = str_replace("\323", '&#1089;', $string);
-         $string = str_replace("\324", '&#1090;', $string);
-         $string = str_replace("\325", '&#1091;', $string);
-         $string = str_replace("\326", '&#1078;', $string);
-         $string = str_replace("\327", '&#1074;', $string);
-         $string = str_replace("\330", '&#1100;', $string);
-         $string = str_replace("\331", '&#1099;', $string);
-         $string = str_replace("\332", '&#1079;', $string);
-         $string = str_replace("\333", '&#1096;', $string);
-         $string = str_replace("\334", '&#1101;', $string);
-         $string = str_replace("\335", '&#1097;', $string);
-         $string = str_replace("\336", '&#1095;', $string);
-         $string = str_replace("\337", '&#1098;', $string);
-         $string = str_replace("\340", '&#1070;', $string);
-         $string = str_replace("\341", '&#1040;', $string);
-         $string = str_replace("\342", '&#1041;', $string);
-         $string = str_replace("\343", '&#1062;', $string);
-         $string = str_replace("\344", '&#1044;', $string);
-         $string = str_replace("\345", '&#1045;', $string);
-         $string = str_replace("\346", '&#1060;', $string);
-         $string = str_replace("\347", '&#1043;', $string);
-         $string = str_replace("\350", '&#1061;', $string);
-         $string = str_replace("\351", '&#1048;', $string);
-         $string = str_replace("\352", '&#1049;', $string);
-         $string = str_replace("\353", '&#1050;', $string);
-         $string = str_replace("\354", '&#1051;', $string);
-         $string = str_replace("\355", '&#1052;', $string);
-         $string = str_replace("\356", '&#1053;', $string);
-         $string = str_replace("\357", '&#1054;', $string);
-         $string = str_replace("\360", '&#1055;', $string);
-         $string = str_replace("\361", '&#1071;', $string);
-         $string = str_replace("\362", '&#1056;', $string);
-         $string = str_replace("\363", '&#1057;', $string);
-         $string = str_replace("\364", '&#1058;', $string);
-         $string = str_replace("\365", '&#1059;', $string);
-         $string = str_replace("\366", '&#1046;', $string);
-         $string = str_replace("\367", '&#1042;', $string);
-         $string = str_replace("\370", '&#1068;', $string);
-         $string = str_replace("\371", '&#1067;', $string);
-         $string = str_replace("\372", '&#1047;', $string);
-         $string = str_replace("\373", '&#1064;', $string);
-         $string = str_replace("\374", '&#1069;', $string);
-         $string = str_replace("\375", '&#1065;', $string);
-         $string = str_replace("\376", '&#1063;', $string);
-         $string = str_replace("\377", '&#1066;', $string);
-
+      if ($default_charset == 'koi8-r')
          return $string;
-      }
+         
+      // Convert to Unicode HTML entities.
+      // This code is rather ineffective.
+      $string = str_replace("\200", '&#9472;', $string);
+      $string = str_replace("\201", '&#9474;', $string);
+      $string = str_replace("\202", '&#9484;', $string);
+      $string = str_replace("\203", '&#9488;', $string);
+      $string = str_replace("\204", '&#9492;', $string);
+      $string = str_replace("\205", '&#9496;', $string);
+      $string = str_replace("\206", '&#9500;', $string);
+      $string = str_replace("\207", '&#9508;', $string);
+      $string = str_replace("\210", '&#9516;', $string);
+      $string = str_replace("\211", '&#9524;', $string);
+      $string = str_replace("\212", '&#9532;', $string);
+      $string = str_replace("\213", '&#9600;', $string);
+      $string = str_replace("\214", '&#9604;', $string);
+      $string = str_replace("\215", '&#9608;', $string);
+      $string = str_replace("\216", '&#9612;', $string);
+      $string = str_replace("\217", '&#9616;', $string);
+      $string = str_replace("\220", '&#9617;', $string);
+      $string = str_replace("\221", '&#9618;', $string);
+      $string = str_replace("\222", '&#9619;', $string);
+      $string = str_replace("\223", '&#8992;', $string);
+      $string = str_replace("\224", '&#9632;', $string);
+      $string = str_replace("\225", '&#8729;', $string);
+      $string = str_replace("\226", '&#8730;', $string);
+      $string = str_replace("\227", '&#8776;', $string);
+      $string = str_replace("\230", '&#8804;', $string);
+      $string = str_replace("\231", '&#8805;', $string);
+      $string = str_replace("\232", '&#160;', $string);
+      $string = str_replace("\233", '&#8993;', $string);
+      $string = str_replace("\234", '&#176;', $string);
+      $string = str_replace("\235", '&#178;', $string);
+      $string = str_replace("\236", '&#183;', $string);
+      $string = str_replace("\237", '&#247;', $string);
+      $string = str_replace("\240", '&#9552;', $string);
+      $string = str_replace("\241", '&#9553;', $string);
+      $string = str_replace("\242", '&#9554;', $string);
+      $string = str_replace("\243", '&#1105;', $string);
+      $string = str_replace("\244", '&#9555;', $string);
+      $string = str_replace("\245", '&#9556;', $string);
+      $string = str_replace("\246", '&#9557;', $string);
+      $string = str_replace("\247", '&#9558;', $string);
+      $string = str_replace("\250", '&#9559;', $string);
+      $string = str_replace("\251", '&#9560;', $string);
+      $string = str_replace("\252", '&#9561;', $string);
+      $string = str_replace("\253", '&#9562;', $string);
+      $string = str_replace("\254", '&#9563;', $string);
+      $string = str_replace("\255", '&#9564;', $string);
+      $string = str_replace("\256", '&#9565;', $string);
+      $string = str_replace("\257", '&#9566;', $string);
+      $string = str_replace("\260", '&#9567;', $string);
+      $string = str_replace("\261", '&#9568;', $string);
+      $string = str_replace("\262", '&#9569;', $string);
+      $string = str_replace("\263", '&#1025;', $string);
+      $string = str_replace("\264", '&#9570;', $string);
+      $string = str_replace("\265", '&#9571;', $string);
+      $string = str_replace("\266", '&#9572;', $string);
+      $string = str_replace("\267", '&#9573;', $string);
+      $string = str_replace("\270", '&#9574;', $string);
+      $string = str_replace("\271", '&#9575;', $string);
+      $string = str_replace("\272", '&#9576;', $string);
+      $string = str_replace("\273", '&#9577;', $string);
+      $string = str_replace("\274", '&#9578;', $string);
+      $string = str_replace("\275", '&#9579;', $string);
+      $string = str_replace("\276", '&#9580;', $string);
+      $string = str_replace("\277", '&#169;', $string);
+      $string = str_replace("\300", '&#1102;', $string);
+      $string = str_replace("\301", '&#1072;', $string);
+      $string = str_replace("\302", '&#1073;', $string);
+      $string = str_replace("\303", '&#1094;', $string);
+      $string = str_replace("\304", '&#1076;', $string);
+      $string = str_replace("\305", '&#1077;', $string);
+      $string = str_replace("\306", '&#1092;', $string);
+      $string = str_replace("\307", '&#1075;', $string);
+      $string = str_replace("\310", '&#1093;', $string);
+      $string = str_replace("\311", '&#1080;', $string);
+      $string = str_replace("\312", '&#1081;', $string);
+      $string = str_replace("\313", '&#1082;', $string);
+      $string = str_replace("\314", '&#1083;', $string);
+      $string = str_replace("\315", '&#1084;', $string);
+      $string = str_replace("\316", '&#1085;', $string);
+      $string = str_replace("\317", '&#1086;', $string);
+      $string = str_replace("\320", '&#1087;', $string);
+      $string = str_replace("\321", '&#1103;', $string);
+      $string = str_replace("\322", '&#1088;', $string);
+      $string = str_replace("\323", '&#1089;', $string);
+      $string = str_replace("\324", '&#1090;', $string);
+      $string = str_replace("\325", '&#1091;', $string);
+      $string = str_replace("\326", '&#1078;', $string);
+      $string = str_replace("\327", '&#1074;', $string);
+      $string = str_replace("\330", '&#1100;', $string);
+      $string = str_replace("\331", '&#1099;', $string);
+      $string = str_replace("\332", '&#1079;', $string);
+      $string = str_replace("\333", '&#1096;', $string);
+      $string = str_replace("\334", '&#1101;', $string);
+      $string = str_replace("\335", '&#1097;', $string);
+      $string = str_replace("\336", '&#1095;', $string);
+      $string = str_replace("\337", '&#1098;', $string);
+      $string = str_replace("\340", '&#1070;', $string);
+      $string = str_replace("\341", '&#1040;', $string);
+      $string = str_replace("\342", '&#1041;', $string);
+      $string = str_replace("\343", '&#1062;', $string);
+      $string = str_replace("\344", '&#1044;', $string);
+      $string = str_replace("\345", '&#1045;', $string);
+      $string = str_replace("\346", '&#1060;', $string);
+      $string = str_replace("\347", '&#1043;', $string);
+      $string = str_replace("\350", '&#1061;', $string);
+      $string = str_replace("\351", '&#1048;', $string);
+      $string = str_replace("\352", '&#1049;', $string);
+      $string = str_replace("\353", '&#1050;', $string);
+      $string = str_replace("\354", '&#1051;', $string);
+      $string = str_replace("\355", '&#1052;', $string);
+      $string = str_replace("\356", '&#1053;', $string);
+      $string = str_replace("\357", '&#1054;', $string);
+      $string = str_replace("\360", '&#1055;', $string);
+      $string = str_replace("\361", '&#1071;', $string);
+      $string = str_replace("\362", '&#1056;', $string);
+      $string = str_replace("\363", '&#1057;', $string);
+      $string = str_replace("\364", '&#1058;', $string);
+      $string = str_replace("\365", '&#1059;', $string);
+      $string = str_replace("\366", '&#1046;', $string);
+      $string = str_replace("\367", '&#1042;', $string);
+      $string = str_replace("\370", '&#1068;', $string);
+      $string = str_replace("\371", '&#1067;', $string);
+      $string = str_replace("\372", '&#1047;', $string);
+      $string = str_replace("\373", '&#1064;', $string);
+      $string = str_replace("\374", '&#1069;', $string);
+      $string = str_replace("\375", '&#1065;', $string);
+      $string = str_replace("\376", '&#1063;', $string);
+      $string = str_replace("\377", '&#1066;', $string);
+      
+      return $string;
    }
 
 
    global $use_gettext;
    
    // Detect whether gettext is installed.
-   // If it is, set the flag so we can use it.
-   if (! function_exists('_') || 
-       ! function_exists('bindtextdomain') ||
-       ! function_exists('textdomain'))
-       $use_gettext = false;
-   else
-       $use_gettext = true;
-          
-
-   // Avoid warnings/errors   
-   if (! function_exists('_')) {
-      function _($str) { return $str; };
-   }
-   if (! function_exists('bindtextdomain')) {
-      function bindtextdomain() { return; }
-   }
-   if (! function_exists('textdomain')) {
-      function textdomain() { return; }
+   $gettext_flags = 0;
+   if (function_exists('_')) $gettext_flags += 1;
+   if (function_exists('bindtextdomain')) $gettext_flags += 2;
+   if (function_exists('textdomain')) $gettext_flags += 4;
+
+   // If gettext is fully loaded, cool
+   if ($gettext_flags == 7)
+      $use_gettext = true;
+   // If we can fake gettext, try that
+   elseif ($gettext_flags == 0) {
+      $use_gettext = true;
+      include_once('../functions/gettext.php');
+   } else {
+      // Uh-ho.  A weird install
+      if (! $gettext_flags & 1) {
+         function _($str) { return $str; };
+      }
+      if (! $gettext_flags & 2) {
+         function bindtextdomain() { return; }
+      }
+      if (! $gettext_flags & 4) {
+         function textdomain() { return; }
+      }
    }
 
 
    // Set up the language to be output
    // if $do_search is true, then scan the browser information
    // for a possible language that we know
-   function set_up_language($sm_language, $do_search = false)
-   {
+   function set_up_language($sm_language, $do_search = false) {
       static $SetupAlready = 0;
-		global $HTTP_ACCEPT_LANGUAGE, $use_gettext, $languages, $squirrelmail_language;
+      global $HTTP_ACCEPT_LANGUAGE, $use_gettext, $languages, 
+          $squirrelmail_language, $squirrelmail_default_language, 
+          $sm_notAlias;
       
       if ($SetupAlready)
          return;
+
       $SetupAlready = 1;
       
       $charset_headers_sent=false;
@@ -768,20 +843,23 @@
       if ($do_search && ! $sm_language && isset($HTTP_ACCEPT_LANGUAGE)) {
          $sm_language = substr($HTTP_ACCEPT_LANGUAGE, 0, 2);
       }
+      if (!$sm_language && isset($squirrelmail_default_language))
+         $squirrelmail_language = $squirrelmail_default_language;
+      $sm_notAlias = $sm_language;
+      while (isset($languages[$sm_notAlias]['ALIAS']))
+         $sm_notAlias = $languages[$sm_notAlias]['ALIAS'];
 
       if (isset($sm_language) && $use_gettext &&
-         $squirrelmail_language != '' &&
-	 isset($languages[$sm_language]['CHARSET'])) {
+          $sm_language != '' &&
+          isset($languages[$sm_notAlias]['CHARSET'])) {
          if ((ini_get('safe_mode') == FALSE) && (getenv('LC_ALL') != $sm_language)) {
-           putenv('LC_ALL=' . $sm_language);
+           putenv('LC_ALL=' . $sm_notAlias);
          }
-         setlocale('LC_ALL', $sm_language);
+         setlocale('LC_ALL', $sm_notAlias);
          bindtextdomain('squirrelmail', '../locale/');
          textdomain('squirrelmail');
-         header ('Content-Type: text/html; charset=' . $languages[$sm_language]['CHARSET']);
-         $charset_headers_sent=true;
+         header ('Content-Type: text/html; charset=' . $languages[$sm_notAlias]['CHARSET']);
       }
-      return $charset_headers_sent;
    }
 
    function set_my_charset(){
@@ -797,8 +875,10 @@
      global $data_dir, $username, $default_charset, $languages;
      $my_language = getPref($data_dir, $username, "language");
      if (!$my_language) return;
+     while (isset($languages[$my_language]['ALIAS']))
+        $my_language = $languages[$my_language]['ALIAS'];
      $my_charset=$languages[$my_language]['CHARSET'];
      if ($my_charset) $default_charset=$my_charset;
    }
 
-?>
+?>
\ No newline at end of file