From 73d9de4e9a2d07fcb9725c8ee62691301ddb2126 Mon Sep 17 00:00:00 2001
From: fidian <fidian@7612ce4b-ef26-0410-bec9-ea0150e637f0>
Date: Thu, 24 May 2001 20:19:16 +0000
Subject: [PATCH] * Added Portuguese (Portugal) translation * Added the rest of
 the aliasing for languages * Added the aliasing to the display options to not
 list aliases * Updated the Authors file * Updated ChangeLog (removed a name
 -- moved it to authors, added stuff)

git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@1408 7612ce4b-ef26-0410-bec9-ea0150e637f0
---
 AUTHORS                 |  4 +++-
 ChangeLog               |  4 +++-
 functions/i18n.php      | 23 +++++++++++++++++++++++
 src/options_display.php | 10 ++++++----
 4 files changed, 35 insertions(+), 6 deletions(-)

diff --git a/AUTHORS b/AUTHORS
index 5a0e835c..f04e7996 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -34,7 +34,9 @@
    Finnish       Teemu Junnila <teejun@vallcom.com>
    Hungarian     István-Attila András <bergkatten@netscape.net>
    Icelandic     Karl Heiðar <karlh@macho.is>
-
+   Indonesian    <arief@fisika.ui.ac.id>
+   Portuguese (Portugal): Ruben Leote Mendes <ruben@nocturno.org>
+ 
  Significant Contributions:
  --------------------------
    i18n support:        Sergiusz Pawlowicz 
diff --git a/ChangeLog b/ChangeLog
index 8b7feb6e..532caa79 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,7 +3,9 @@ Version 1.1.3 -- DEVELOPMENT
 - Fixed MOTD
 - Fixed multipart/alternative messages
 - Updated Dutch translation
-- Added Indonesian translation <arief (at) fisika (dot) ui (dot) ac (dot) id>
+- Added Indonesian translation
+- Added Portuguese (Portugal) translation
+- Added language aliasing
 
 Version 1.1.2 -- May 21, 2001 
 -----------------------------
diff --git a/functions/i18n.php b/functions/i18n.php
index 289e7ee1..0ef349b9 100644
--- a/functions/i18n.php
+++ b/functions/i18n.php
@@ -22,63 +22,84 @@
    // This array specifies the available languages.
    $languages['en']['NAME']    = 'English';
    $languages['en']['CHARSET'] = 'iso-8859-1';
+   $languages['en_EN']['ALIAS'] = 'en';
    
    $languages['ca']['NAME']    = 'Catalan';
    $languages['ca']['CHARSET'] = 'iso-8859-1';
+   $languages['ca_CA']['ALIAS'] = 'ca';
 
    $languages['hr']['NAME']    = 'Croatian';
    $languages['hr']['CHARSET'] = 'iso-8859-2';
+   $languages['hr_HR']['ALIAS'] = 'hr';
 
    $languages['cs_CZ']['NAME']    = 'Czech';
    $languages['cs_CZ']['CHARSET'] = 'iso-8859-2';
    
    $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['id']['NAME']    = 'Indonesian';
    $languages['id']['CHARSET'] = 'iso-8859-1';
+   $languages['id_ID']['ALIAS'] = 'id';
    
    $languages['nl']['NAME']    = 'Dutch';
    $languages['nl']['CHARSET'] = 'iso-8859-1';
+   $languages['nl_NL']['ALIAS'] = 'nl';
    
    $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['fi_FI']['ALIAS'] = 'fi';
 
    $languages['hu']['NAME']    = 'Hungarian';
    $languages['hu']['CHARSET'] = 'iso-8859-1';
+   $languages['hu_HU']['ALIAS'] = 'hu';
 
    $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']['CHARSET'] = 'ko';
    
    $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_PT']['CHARSET'] = 'pt';
    
    $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['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';
@@ -86,9 +107,11 @@
 
    $languages['sv']['NAME']    = 'Swedish';
    $languages['sv']['CHARSET'] = 'iso-8859-1';
+   $languages['sv_SV']['ALIAS'] = 'sv';
    
    $languages['tw']['NAME']    = 'Taiwan';
    $languages['tw']['CHARSET'] = 'big5';
+   $languages['tw_TW']['ALIAS'] = 'tw';
    
 
    // Decodes a string to the internal encoding from the given charset
diff --git a/src/options_display.php b/src/options_display.php
index fc84d562..88b8c265 100644
--- a/src/options_display.php
+++ b/src/options_display.php
@@ -51,10 +51,12 @@
 <?php
    echo '         <tt><select name="language">' . "\n";
    foreach ($languages as $code => $name) {
-      if ($code==$chosen_language)
-         echo '         <OPTION SELECTED VALUE="'.$code.'">'.$languages[$code]['NAME']."\n";
-      else
-         echo '         <OPTION VALUE="'.$code.'">'.$languages[$code]['NAME']."\n";
+      if (! isset($name['ALIAS'])) {
+         if ($code==$chosen_language)
+            echo '         <OPTION SELECTED VALUE="'.$code.'">'.$name['NAME']."\n";
+         else
+            echo '         <OPTION VALUE="'.$code.'">'.$name['NAME']."\n";
+      }
    }
    echo '         </select></tt>';  
    if (! $use_gettext)
-- 
2.25.1