From ea5260243f2769243166232a615e071025e6d4d7 Mon Sep 17 00:00:00 2001
From: tokul <tokul@7612ce4b-ef26-0410-bec9-ea0150e637f0>
Date: Sat, 27 Dec 2003 12:06:26 +0000
Subject: [PATCH] translation engine updates. Disabled non functional "when
 composing" prefs

git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@6331 7612ce4b-ef26-0410-bec9-ea0150e637f0
---
 plugins/translate/README      |   1 +
 plugins/translate/options.php |  28 +-
 plugins/translate/setup.php   | 687 +++++++++++++++-------------------
 3 files changed, 326 insertions(+), 390 deletions(-)

diff --git a/plugins/translate/README b/plugins/translate/README
index 2654ecf2..0fc6e7c7 100644
--- a/plugins/translate/README
+++ b/plugins/translate/README
@@ -45,6 +45,7 @@ InterTran = tranexp.com
 GPLTrans = www.translator.cx
 OteNet = systran.otenet.gr
 Promt = www.translate.ru
+Google Translate = www.google.com/translate
 
 Installation
 ============
diff --git a/plugins/translate/options.php b/plugins/translate/options.php
index 72503ec4..1f4add85 100644
--- a/plugins/translate/options.php
+++ b/plugins/translate/options.php
@@ -111,34 +111,34 @@ require_once(SM_PATH . 'include/load_prefs.php');
 <?php
     ShowTrad( 'Babelfish',
               _("Maximum of 1000 characters translated, powered by Systran").
-	      "<br>".sprintf(_("Number of supported language pairs: %s"),"19")." " ,
+	      "<br />".sprintf(_("Number of supported language pairs: %s"),"19")." " ,
               'http://babelfish.altavista.com/' );
 //    ShowTrad( 'Translator.Go.com',
 //              _("10 language pairs, maximum of 25 kilobytes translated, powered by Systran"),
 //              'http://translator.go.com/' );
     ShowTrad( 'Dictionary.com',
               _("No known limits, powered by Systran").
-	      "<br>".sprintf(_("Number of supported language pairs: %s"),"12")." " ,
+	      "<br />".sprintf(_("Number of supported language pairs: %s"),"24")." " ,
               'http://www.dictionary.com/translate' );
     ShowTrad( 'Google Translate',
               _("No known limits, powered by Systran").
-	      "<br>".sprintf(_("Number of supported language pairs: %s"),"12")." " ,
+	      "<br />".sprintf(_("Number of supported language pairs: %s"),"12")." " ,
               'http://www.google.com/translate' );
     ShowTrad( 'GPLTrans',
               _("No known limits, powered by GPLTrans (free, open source)").
-	      "<br>".sprintf(_("Number of supported language pairs: %s"),"8")." " ,
+	      "<br />".sprintf(_("Number of supported language pairs: %s"),"16")." " ,
               'http://www.translator.cx/' );
     ShowTrad( 'InterTran',
               _("No known limits, powered by Translation Experts's InterTran").
-	      "<br>".sprintf(_("Number of supported languages: %s"),"28")." " ,
+	      "<br />".sprintf(_("Number of supported languages: %s"),"29")." " ,
               'http://www.tranexp.com/' );
     ShowTrad( 'OTEnet',
               _("Hellenic translations, no known limits, powered by Systran").
-	      "<br>".sprintf(_("Number of supported language pairs: %s"),"20")." " ,
+	      "<br />".sprintf(_("Number of supported language pairs: %s"),"20")." " ,
               'http://systran.otenet.gr/' );
     ShowTrad( 'PROMT',
               _("Russian translations, maximum of 500 characters translated").
-	      "<br>".sprintf(_("Number of supported language pairs: %s"),"12")." " ,
+	      "<br />".sprintf(_("Number of supported language pairs: %s"),"13")." " ,
               'http://www.translate.ru/' );
 ?>
    </ul>
@@ -176,14 +176,18 @@ require_once(SM_PATH . 'include/load_prefs.php');
     if ($translate_same_window)
         echo " CHECKED";
     echo '> - ' . _("Translate inside the SquirrelMail frames").
-         '</td></tr>'.
-         '<tr>'.html_tag('td',_("When composing:"),'right','','nowrap').
+    "</td></tr>\n";
+
+$disable_compose_translate=true;
+if (!$disable_compose_translate) {
+   echo '<tr>'.html_tag('td',_("When composing:"),'right','','nowrap').
          '<td><input type=checkbox name="translate_translate_show_send"';
    if ($translate_show_send)
-     echo " CHECKED";
+      echo " CHECKED";
    echo '> - ' . _("Not yet functional, currently does nothing") .
-        '</td></tr>'.
-        '<tr><td></td><td>'.
+      "</td></tr>\n";
+}
+   echo '<tr><td></td><td>'.
         '<input type="submit" value="' . _("Submit") . '" name="submit_translate">'.
         '</td></tr>'.
    '</table>'.
diff --git a/plugins/translate/setup.php b/plugins/translate/setup.php
index ccabd482..53308984 100644
--- a/plugins/translate/setup.php
+++ b/plugins/translate/setup.php
@@ -1,5 +1,4 @@
 <?php
-
 /**
  * setup.php
  *
@@ -11,25 +10,11 @@
  * @subpackage translate
  */
 
-/* Easy plugin that sends the body of the message to a new browser
-window using the specified translator.  It can also translate your
-outgoing message if you send it to someone in a different country. 
-
-  Languages from i18n, incorporated in the auto-language selection:
-    en - English
-    no - Norwegian (Bokm&aring;l)
-    no_NO_ny - Norwegian (Nynorsk)
-    de - Deutsch
-    ru - Russian KOI8-R
-    pl - Polish
-    sv - Swedish
-    nl - Dutch
-    pt_BR - Portuguese (Brazil)
-    fr - French
-    it - Italian
-    cs - Czech
-    es - Spanish
-    ko - Korean
+/* 
+Easy plugin that sends the body of the message to a new browser
+window using the specified translator.
+
+Translation of composed messages is not supported.
 */
 
 
@@ -47,7 +32,9 @@ function squirrelmail_plugin_init_translate() {
 }
 
 
-/* Show the translation for a message you're reading */
+/** 
+ * Shows translation box in message display window 
+ */
 function translate_read_form() {
     global $color, $translate_server;
     global $message, $translate_dir;
@@ -95,6 +82,9 @@ if ($trans_ar[0] != '') {
     $function($new_body);
 }
 
+/**
+ * Closes table tags in translation box
+ */
 function translate_table_end() {                     
   ?></td>
           </tr>
@@ -106,7 +96,10 @@ function translate_table_end() {
   <?php
 }
 
-
+/**
+ * FIXME:
+ * Undocumented function.
+ */
 function translate_button() {
     global $translate_show_send;
   
@@ -115,7 +108,9 @@ function translate_button() {
     }
 }
 
-
+/**
+ * Adds translation option block
+ */
 function translate_optpage_register_block() {
     global $optpage_blocks;
     $optpage_blocks[] = array(
@@ -126,6 +121,9 @@ function translate_optpage_register_block() {
     );
 }
 
+/**
+ * Gets user's translation preferences
+ */
 function translate_pref() { 
     global $username, $data_dir;
     global $translate_server, $translate_location;
@@ -149,6 +147,11 @@ function translate_pref() {
 
 
 /**
+ * Tries to select default translation combination
+ * 
+ * @param string $test language code that has to be tested.
+ * @returm boolean true if language code matches user's language.
+ *
  * This function could be speed up.
  * It basically negates the process if a ! is found in the beginning and
  * matches a * at the end with 0 or more characters.
@@ -188,7 +191,9 @@ function translate_does_it_match_language($test) {
     return $false;
 }
 
-
+/**
+ * Creates language option selection box.
+ */
 function translate_lang_opt($from, $to, $value, $text) {
     global $translate_dir;
 
@@ -207,7 +212,11 @@ function translate_lang_opt($from, $to, $value, $text) {
     return( $ret );
 }
 
-
+/**
+ * Starts translation box
+ *
+ * @param string $action url that has to recieve message for translation
+ */
 function translate_new_form($action) {
     global $translate_dir, $translate_new_window, $translate_location;
     global $color, $translate_same_window;
@@ -236,6 +245,11 @@ function translate_new_form($action) {
             <td><?php
 }
 
+/**
+ * Babelfish translation engine functions
+ *
+ * @param string $message text that has to be translated.
+ */
 function translate_form_babelfish($message) {
     translate_new_form('http://babelfish.altavista.com/babelfish/tr');
 ?>
@@ -244,133 +258,80 @@ function translate_form_babelfish($message) {
     <input type="hidden" name="tt" value="urltext">
     <input type="hidden" name="urltext" value="<?php echo $message; ?>">
     <select name="lp"><?php
-        echo translate_lang_opt('en',  'zh',  'en_zh',
-                                sprintf( _("%s to %s"),
-                                         _("English"),
-                                         _("Chinese"))) .
-	     translate_lang_opt('en',  'fr',  'en_fr',
-                                sprintf( _("%s to %s"),
-                                         _("English"),
-                                         _("French"))) .
-             translate_lang_opt('',    'de',  'en_de',
-                                sprintf( _("%s to %s"),
-                                         _("English"),
-                                         _("German"))) .
-             translate_lang_opt('',    'it',  'en_it',
-                                sprintf( _("%s to %s"),
-                                         _("English"),
-                                         _("Italian"))) .
-	     translate_lang_opt('en',  'ja',  'en_ja',
-                                sprintf( _("%s to %s"),
-                                         _("English"),
-                                         _("Japanese"))) .
-	     translate_lang_opt('en',  'ko',  'en_ko',
-                                sprintf( _("%s to %s"),
-                                         _("English"),
-                                         _("Korean"))) .
-             translate_lang_opt('',    'pt*', 'en_pt',
-                                sprintf( _("%s to %s"),
-                                         _("English"),
-                                         _("Portuguese"))) .
-             translate_lang_opt('',    'es',  'en_es',
-                                sprintf( _("%s to %s"),
-                                         _("English"),
-                                         _("Spanish"))) .
-             translate_lang_opt('zh',  'en',  'zh_en',
-                                sprintf( _("%s to %s"),
-                                         _("Chinese"),
-                                         _("English"))) .
-             translate_lang_opt('fr',  'en',  'fr_en',
-                                sprintf( _("%s to %s"),
-                                         _("French"),
-                                         _("English"))) .
-             translate_lang_opt('de',  '',    'de_en',
-                                sprintf( _("%s to %s"),
-                                         _("German"),
-                                         _("English"))) .
-             translate_lang_opt('it',  '',    'it_en',
-                                sprintf( _("%s to %s"),
-                                         _("Italian"),
-                                         _("English"))) .
-             translate_lang_opt('ja',  'en',  'ja_en',
-                                sprintf( _("%s to %s"),
-                                         _("Japanese"),
-                                         _("English"))) .
-             translate_lang_opt('ko',  'en',  'ko_en',
-                                sprintf( _("%s to %s"),
-                                         _("Korean"),
-                                         _("English"))) .
-             translate_lang_opt('pt*', '',    'pt_en',
-                                sprintf( _("%s to %s"),
-                                         _("Portuguese"),
-                                         _("English"))) .
-             translate_lang_opt('es',  '',    'es_en',
-                                sprintf( _("%s to %s"),
-                                         _("Spanish"),
-                                         _("English"))) .
-             translate_lang_opt('',    '',    'de_fr',
-                                sprintf( _("%s to %s"),
-                                         _("German"),
-                                         _("French"))) .
-             translate_lang_opt('',    '',    'fr_de',
-                                sprintf( _("%s to %s"),
-                                         _("French"),
-                                         _("German"))) .
-             translate_lang_opt('ru',  '',    'ru_en',
-                                sprintf( _("%s to %s"),
-                                         _("Russian"),
-                                         _("English")));
+        echo translate_lang_opt('en_US', 'zh_CN', 'en_zh',
+                                sprintf( _("%s to %s"),_("English"),_("Chinese"))) .
+	     translate_lang_opt('en_US', 'fr_FR',  'en_fr',
+                                sprintf( _("%s to %s"),_("English"),_("French"))) .
+             translate_lang_opt('en_US', 'de_DE', 'en_de',
+				sprintf( _("%s to %s"),_("English"),_("German"))) .
+             translate_lang_opt('en_US', 'it_IT', 'en_it',
+                                sprintf( _("%s to %s"),_("English"),_("Italian"))) .
+	     translate_lang_opt('en_US', 'ja_JP', 'en_ja',
+                                sprintf( _("%s to %s"),_("English"),_("Japanese"))) .
+	     translate_lang_opt('en_US', 'ko_KR', 'en_ko',
+                                sprintf( _("%s to %s"),_("English"),_("Korean"))) .
+             translate_lang_opt('en_US', 'pt*',   'en_pt',
+                                sprintf( _("%s to %s"),_("English"),_("Portuguese"))) .
+             translate_lang_opt('en_US', 'es_ES', 'en_es',
+                                sprintf( _("%s to %s"),_("English"),_("Spanish"))) .
+             translate_lang_opt('zh_CN',  '',     'zh_en',
+                                sprintf( _("%s to %s"),_("Chinese"),_("English"))) .
+             translate_lang_opt('fr_FR', '',      'fr_en',
+                                sprintf( _("%s to %s"),_("French"),_("English"))) .
+             translate_lang_opt('de_DE', 'en_US', 'de_en',
+                                sprintf( _("%s to %s"),_("German"),_("English"))) .
+             translate_lang_opt('it_IT', '',      'it_en',
+                                sprintf( _("%s to %s"),_("Italian"),_("English"))) .
+             translate_lang_opt('ja_JP',  '',    'ja_en',
+                                sprintf( _("%s to %s"),_("Japanese"),_("English"))) .
+             translate_lang_opt('ko_KR',  '',    'ko_en',
+                                sprintf( _("%s to %s"),_("Korean"),_("English"))) .
+             translate_lang_opt('pt*',    '',    'pt_en',
+                                sprintf( _("%s to %s"),_("Portuguese"),_("English"))) .
+             translate_lang_opt('es_ES',  '',    'es_en',
+                                sprintf( _("%s to %s"),_("Spanish"),_("English"))) .
+             translate_lang_opt('de_DE',  '',    'de_fr',
+                                sprintf( _("%s to %s"),_("German"),_("French"))) .
+             translate_lang_opt('fr_FR',  '',    'fr_de',
+                                sprintf( _("%s to %s"),_("French"),_("German"))) .
+             translate_lang_opt('ru_RU',  '',    'ru_en',
+                                sprintf( _("%s to %s"),_("Russian"),_("English")));
     echo '</select>'.
          'Babelfish: <input type="Submit" value="' . _("Translate") . '">';
 
     translate_table_end();
 }
 
+/**
+ * go.com translation engine (disabled)
+ *
+ * @param string $message text that has to be translated
+ */
 function translate_form_go($message) {
     translate_new_form('http://translator.go.com/cb/trans_entry');
 ?>
     <input type=hidden name=input_type value=text>
     <select name=lp><?php
-        echo translate_lang_opt('en', 'es', 'en_sp',
-                                sprintf( _("%s to %s"),
-                                         _("English"),
-                                         _("Spanish"))) .
-             translate_lang_opt('',   'fr', 'en_fr',
-                                sprintf( _("%s to %s"),
-                                         _("English"),
-                                         _("French"))) .
-             translate_lang_opt('',   'de', 'en_ge',
-                                sprintf( _("%s to %s"),
-                                         _("English"),
-                                         _("German"))) .
-             translate_lang_opt('',   'it', 'en_it',
-                                sprintf( _("%s to %s"),
-                                         _("English"),
-                                         _("Italian"))) .
-             translate_lang_opt('',   'pt', 'en_pt',
-                                sprintf( _("%s to %s"),
-                                         _("English"),
-                                         _("Portuguese"))) .
-             translate_lang_opt('es', 'en', 'sp_en',
-                                sprintf( _("%s to %s"),
-                                         _("Spanish"),
-                                         _("English"))) .
-             translate_lang_opt('fr', '',   'fr_en',
-                                sprintf( _("%s to %s"),
-                                         _("French"),
-                                         _("English"))) .
-             translate_lang_opt('de', '',   'ge_en',
-                                sprintf( _("%s to %s"),
-                                         _("German"),
-                                         _("English"))) .
-             translate_lang_opt('it', '',   'it_en',
-                                sprintf( _("%s to %s"),
-                                         _("Italian"),
-                                         _("English"))) .
-             translate_lang_opt('pt', '',   'pt_en',
-                                sprintf( _("%s to %s"),
-                                         _("Portuguese"),
-                                         _("English")));
+        echo translate_lang_opt('en_US', 'es_ES', 'en_sp',
+                                sprintf( _("%s to %s"),_("English"),_("Spanish"))) .
+             translate_lang_opt('en_US', 'fr_FR', 'en_fr',
+                                sprintf( _("%s to %s"),_("English"),_("French"))) .
+             translate_lang_opt('en_US', 'de_DE', 'en_ge',
+                                sprintf( _("%s to %s"),_("English"),_("German"))) .
+             translate_lang_opt('en_US', 'it_IT', 'en_it',
+                                sprintf( _("%s to %s"),_("English"),_("Italian"))) .
+             translate_lang_opt('en_US', 'pt*',   'en_pt',
+                                sprintf( _("%s to %s"),_("English"),_("Portuguese"))) .
+             translate_lang_opt('es_ES', '',      'sp_en',
+                                sprintf( _("%s to %s"),_("Spanish"),_("English"))) .
+             translate_lang_opt('fr_FR', '',      'fr_en',
+                                sprintf( _("%s to %s"),_("French"),_("English"))) .
+             translate_lang_opt('de_DE', 'en_US', 'ge_en',
+                                sprintf( _("%s to %s"),_("German"),_("English"))) .
+             translate_lang_opt('it_IT', '',      'it_en',
+                                sprintf( _("%s to %s"),_("Italian"),_("English"))) .
+             translate_lang_opt('pt*',   '',      'pt_en',
+                                sprintf( _("%s to %s"),_("Portuguese"),_("English")));
     echo '</select>'.
          "<input type=\"hidden\" name=\"text\" value=\"$message\">".
          'Go.com: <input type="Submit" value="' . _("Translate") . '">';
@@ -378,6 +339,11 @@ function translate_form_go($message) {
     translate_table_end();
 }
 
+/**
+ * intertran translation engine
+ *
+ * @param string $message text that has to be translated
+ */
 function translate_form_intertran($message) {
     translate_new_form('http://www.tranexp.com:2000/InterTran');
     echo '<INPUT TYPE="hidden" NAME="topframe" VALUE="yes">'.
@@ -386,64 +352,66 @@ function translate_form_intertran($message) {
 
     $left = '<SELECT name="from">' .
         translate_lang_opt('pt_BR', '',    'pob', _("Brazilian Portuguese")).
-        translate_lang_opt('',      '',    'bul', _("Bulgarian") . ' (CP 1251)').
-        translate_lang_opt('',      '',    'cro', _("Croatian") . ' (CP 1250)').
-        translate_lang_opt('cs',    '',    'che', _("Czech") . ' (CP 1250)').
-        translate_lang_opt('',      '',    'dan', _("Danish")).
-        translate_lang_opt('nl',    '',    'dut', _("Dutch")).
-        translate_lang_opt('en',    '!en', 'eng', _("English")).
-        translate_lang_opt('',      '',    'spe', _("European Spanish")).
-        translate_lang_opt('',      '',    'fin', _("Finnish")).
-        translate_lang_opt('fr',    '',    'fre', _("French")).
+        translate_lang_opt('bg_BG', '',    'bul', _("Bulgarian") . ' (CP 1251)').
+        translate_lang_opt('hr_HR', '',    'cro', _("Croatian") . ' (CP 1250)').
+        translate_lang_opt('cs_CZ', '',    'che', _("Czech") . ' (CP 1250)').
+        translate_lang_opt('da_DK', '',    'dan', _("Danish")).
+        translate_lang_opt('nl_NL', '',    'dut', _("Dutch")).
+        translate_lang_opt('en_US', '!en', 'eng', _("English")).
+        translate_lang_opt('tl_PH', '',    'tag', _("Filipino (Tagalog)")).
+        translate_lang_opt('fi_FI', '',    'fin', _("Finnish")).
+        translate_lang_opt('fr_FR', '',    'fre', _("French")).
         translate_lang_opt('de_DE', '',    'ger', _("German")).
-        translate_lang_opt('',      '',    'grk', _("Greek")).
-        translate_lang_opt('',      '',    'hun', _("Hungarian") . ' (CP 1250)').
-        translate_lang_opt('',      '',    'ice', _("Icelandic")).
-        translate_lang_opt('it',    '',    'ita', _("Italian")).
-        translate_lang_opt('',      '',    'jpn', _("Japanese") . ' (Shift JIS)').
-        translate_lang_opt('',      '',    'spl', _("Latin American Spanish")).
+        translate_lang_opt('el_GR', '',    'grk', _("Greek")).
+        translate_lang_opt('hu_HU', '',    'hun', _("Hungarian") . ' (CP 1250)').
+        translate_lang_opt('is_IS', '',    'ice', _("Icelandic")).
+        translate_lang_opt('it_IT', '',    'ita', _("Italian")).
+        translate_lang_opt('ja_JP', '',    'jpn', _("Japanese") . ' (Shift JIS)').
+        translate_lang_opt('la',    '',    'ltt', _("Latin")).
+        translate_lang_opt('es*',   '',    'spl', _("Latin American Spanish")).
         translate_lang_opt('no*',   '',    'nor', _("Norwegian")).
-        translate_lang_opt('pl',    '',    'pol', _("Polish") . ' (ISO 8859-2)').
-        translate_lang_opt('',      '',    'poe', _("Portuguese")).
-        translate_lang_opt('',      '',    'rom', _("Romanian") . ' (CP 1250)').
-        translate_lang_opt('ru',    '',    'rus', _("Russian") . ' (CP 1251)').
-        translate_lang_opt('',      '',    'sel', _("Serbian") . ' (CP 1250)').
-        translate_lang_opt('',      '',    'slo', _("Slovenian") . ' (CP 1250)').
-        translate_lang_opt('es',    '',    'spa', _("Spanish")).
-        translate_lang_opt('sv',    '',    'swe', _("Swedish")).
-        translate_lang_opt('',      '',    'tur', _("Turkish") . ' (CP 1254)').
-        translate_lang_opt('',      '',    'wel', _("Welsh")).
+        translate_lang_opt('pl_PL', '',    'pol', _("Polish") . ' (ISO 8859-2)').
+        translate_lang_opt('pt*',   '',    'poe', _("Portuguese")).
+        translate_lang_opt('ro_RO', '',    'rom', _("Romanian") . ' (CP 1250)').
+        translate_lang_opt('ru_RU', '',    'rus', _("Russian") . ' (CP 1251)').
+        translate_lang_opt('sr_YU', '',    'sel', _("Serbian") . ' (CP 1250)').
+        translate_lang_opt('sl_SI', '',    'slo', _("Slovenian") . ' (CP 1250)').
+        translate_lang_opt('es_ES', '',    'spa', _("Spanish")).
+        translate_lang_opt('sv_SE', '',    'swe', _("Swedish")).
+        translate_lang_opt('tr_TR', '',    'tur', _("Turkish") . ' (CP 1254)').
+        translate_lang_opt('cy_GB', '',    'wel', _("Welsh")).
         '</SELECT>';
 
     $right = '<SELECT name="to">'.
         translate_lang_opt('',    'pt_BR', 'pob', _("Brazilian Portuguese")).
-        translate_lang_opt('',    '',      'bul', _("Bulgarian") . ' (CP 1251)').
-        translate_lang_opt('',    '',      'cro', _("Croatian") . ' (CP 1250)').
-        translate_lang_opt('',    'cs',    'che', _("Czech") . ' (CP 1250)').
-        translate_lang_opt('',    '',      'dan', _("Danish")).
-        translate_lang_opt('',    'nl',    'dut', _("Dutch")).
-        translate_lang_opt('!en', 'en',    'eng', _("English")).
-        translate_lang_opt('',    '',      'spe', _("European Spanish")).
-        translate_lang_opt('',    '',      'fin', _("Finnish")).
-        translate_lang_opt('',    'fr',    'fre', _("French")).
-        translate_lang_opt('',    'de_DE',    'ger', _("German")).
-        translate_lang_opt('',    '',      'grk', _("Greek")).
-        translate_lang_opt('',    '',      'hun', _("Hungarian") . ' (CP 1250)').
-        translate_lang_opt('',    '',      'ice', _("Icelandic")).
-        translate_lang_opt('',    'it',    'ita', _("Italian")).
-        translate_lang_opt('',    '',      'jpn', _("Japanese") . ' (Shift JIS)').
-        translate_lang_opt('',    '',      'spl', _("Latin American Spanish")).
+        translate_lang_opt('',    'bg_BG', 'bul', _("Bulgarian") . ' (CP 1251)').
+        translate_lang_opt('',    'hr_HR', 'cro', _("Croatian") . ' (CP 1250)').
+        translate_lang_opt('',    'cs_CZ', 'che', _("Czech") . ' (CP 1250)').
+        translate_lang_opt('',    'da_DK', 'dan', _("Danish")).
+        translate_lang_opt('',    'nl_NL', 'dut', _("Dutch")).
+        translate_lang_opt('!en', 'en_US', 'eng', _("English")).
+        translate_lang_opt('',    'tl_PH', 'tag', _("Filipino (Tagalog)")).
+        translate_lang_opt('',    'fi_FI', 'fin', _("Finnish")).
+        translate_lang_opt('',    'fr_FR', 'fre', _("French")).
+        translate_lang_opt('',    'de_DE', 'ger', _("German")).
+        translate_lang_opt('',    'el_GR', 'grk', _("Greek")).
+        translate_lang_opt('',    'hu_HU', 'hun', _("Hungarian") . ' (CP 1250)').
+        translate_lang_opt('',    'is_IS', 'ice', _("Icelandic")).
+        translate_lang_opt('',    'it_IT', 'ita', _("Italian")).
+        translate_lang_opt('',    'ja_JP', 'jpn', _("Japanese") . ' (Shift JIS)').
+        translate_lang_opt('',    'la',    'ltt', _("Latin")).
+        translate_lang_opt('',    'es*',   'spl', _("Latin American Spanish")).
         translate_lang_opt('',    'no*',   'nor', _("Norwegian")).
-        translate_lang_opt('',    'pl',    'pol', _("Polish") . ' (ISO 8859-2)').
-        translate_lang_opt('',    '',      'poe', _("Portuguese")).
-        translate_lang_opt('',    '',      'rom', _("Romanian") . ' (CP 1250)').
-        translate_lang_opt('',    'ru',    'rus', _("Russian") . ' (CP 1251)').
-        translate_lang_opt('',    '',      'sel', _("Serbian") . ' (CP 1250)').
-        translate_lang_opt('',    '',      'slo', _("Slovenian") . ' (CP 1250)').
-        translate_lang_opt('',    'es',    'spa', _("Spanish")).
-        translate_lang_opt('',    'sv',    'swe', _("Swedish")).
-        translate_lang_opt('',      '',    'tur', _("Turkish") . ' (CP 1254)').
-        translate_lang_opt('',    '',      'wel', _("Welsh")).
+        translate_lang_opt('',    'pl_PL', 'pol', _("Polish") . ' (ISO 8859-2)').
+        translate_lang_opt('',    'pt_PT', 'poe', _("Portuguese")).
+        translate_lang_opt('',    'ro_RO', 'rom', _("Romanian") . ' (CP 1250)').
+        translate_lang_opt('',    'ru_RU', 'rus', _("Russian") . ' (CP 1251)').
+        translate_lang_opt('',    'sr_YU', 'sel', _("Serbian") . ' (CP 1250)').
+        translate_lang_opt('',    'sl_SI', 'slo', _("Slovenian") . ' (CP 1250)').
+        translate_lang_opt('',    'es_ES', 'spa', _("Spanish")).
+        translate_lang_opt('',    'sv_SE', 'swe', _("Swedish")).
+        translate_lang_opt('',    'tr_TR', 'tur', _("Turkish") . ' (CP 1254)').
+        translate_lang_opt('',    'cy_GB', 'wel', _("Welsh")).
         '</SELECT>';
     printf( _("%s to %s"), $left, $right );
     echo 'InterTran: <input type=submit value="' . _("Translate") . '">';
@@ -451,17 +419,22 @@ function translate_form_intertran($message) {
     translate_table_end();
 }
 
+/**
+ * gpltrans translation engine
+ *
+ * @param string $message text that has to be translated
+ */
 function translate_form_gpltrans($message) {
     translate_new_form('http://www.translator.cx/cgi-bin/gplTrans');
     echo '<select name="language">'.
-        translate_lang_opt('nl', 'nl', 'dutch_dict',      _("Dutch")).
-        translate_lang_opt('fr', 'fr', 'french_dict',     _("French")).
-        translate_lang_opt('de', 'de', 'german_dict',     _("German")).
-        translate_lang_opt('',   '',   'indonesian_dict', _("Indonesian")).
-        translate_lang_opt('it', 'it', 'italian_dict',    _("Italian")).
-        translate_lang_opt('',   '',   'latin_dict',      _("Latin")).
-        translate_lang_opt('pt', 'pt', 'portuguese_dict', _("Portuguese")).
-        translate_lang_opt('es', 'es', 'spanish_dict',    _("Spanish")).
+        translate_lang_opt('', 'nl_NL', 'dutch_dict',      _("Dutch")).
+        translate_lang_opt('', 'fr_FR', 'french_dict',     _("French")).
+        translate_lang_opt('', 'de_DE', 'german_dict',     _("German")).
+        translate_lang_opt('', 'id_ID', 'indonesian_dict', _("Indonesian")).
+        translate_lang_opt('', 'it_IT', 'italian_dict',    _("Italian")).
+        translate_lang_opt('', 'la',    'latin_dict',      _("Latin")).
+        translate_lang_opt('', 'pt*',   'portuguese_dict', _("Portuguese")).
+        translate_lang_opt('', 'es_ES', 'spanish_dict',    _("Spanish")).
         '</select>';
     echo '<select name="toenglish">';
     echo '<option value="yes" >'. _("to English") . '</option>';
@@ -472,67 +445,77 @@ function translate_form_gpltrans($message) {
     translate_table_end();
 }
 
+/**
+ * reference.com (dictionary) translation engine
+ *
+ * @param string $message text that has to be translated
+ */
 function translate_form_dictionary($message) {
     translate_new_form('http://dictionary.reference.com/translate/text.html');
     list($usec, $sec) = explode(" ",microtime());
     $time = $sec . (float)$usec*100000000;
-    echo "<input type=hidden name=text value=\"$message\">".
-         "<input type=hidden name=r value=\"$time\">".
+    echo "<input type=hidden name=text value=\"$message\" />".
+         "<input type=hidden name=r value=\"$time\" />".
          '<SELECT NAME="lp">'.
-         translate_lang_opt('en',  'fr', 'en_fr',
-                            sprintf( _("%s to %s"),
-                                     _("English"),
-                                     _("French"))) .
-         translate_lang_opt('',    'ge', 'en_ge',
-                            sprintf( _("%s to %s"),
-                                     _("English"),
-                                     _("German"))) .
-         translate_lang_opt('',    'it', 'en_it',
-                            sprintf( _("%s to %s"),
-                                     _("English"),
-                                     _("Italian"))) .
-         translate_lang_opt('',    'pt*', 'en_pt',
-                            sprintf( _("%s to %s"),
-                                     _("English"),
-                                     _("Portuguese"))) .
-         translate_lang_opt('',    'es', 'en_es',
-                            sprintf( _("%s to %s"),
-                                     _("English"),
-                                     _("Spanish"))) .
-         translate_lang_opt('fr',  '', 'fr_en',
-                            sprintf( _("%s to %s"),
-                                     _("French"),
-                                     _("English"))) .
-         translate_lang_opt('',    '', 'fr_ge',
-                            sprintf( _("%s to %s"),
-                                     _("French"),
-                                     _("German"))) .
-         translate_lang_opt('',    '', 'ge_fr',
-                            sprintf( _("%s to %s"),
-                                     _("German"),
-                                     _("French"))) .
-         translate_lang_opt('de',  '', 'ge_en',
-                            sprintf( _("%s to %s"),
-                                     _("German"),
-                                     _("English"))) .
-         translate_lang_opt('it',  '', 'it_en',
-                            sprintf( _("%s to %s"),
-                                     _("Italian"),
-                                     _("English"))) .
-         translate_lang_opt('pt*', '', 'pt_en',
-                            sprintf( _("%s to %s"),
-                                     _("Portuguese"),
-                                     _("English"))) .
-         translate_lang_opt('es',  '', 'es_en',
-                            sprintf( _("%s to %s"),
-                                     _("Spanish"),
-                                     _("English"))) .
+         translate_lang_opt('en_US', 'zh_CN', 'en_zh',
+                            sprintf( _("%s to %s"),_("English"),_("Simplified Chinese"))) .
+         translate_lang_opt('en_US', 'zh_TW', 'en_zt',
+                            sprintf( _("%s to %s"),_("English"),_("Traditional Chinese"))) .
+         translate_lang_opt('en_US', 'nl_NL', 'en_nl',
+                            sprintf( _("%s to %s"),_("English"),_("Dutch"))) .
+         translate_lang_opt('en_US', 'fr_FR', 'en_fr',
+                            sprintf( _("%s to %s"),_("English"),_("French"))) .
+         translate_lang_opt('en_US', 'de_DE', 'en_ge',
+                            sprintf( _("%s to %s"),_("English"),_("German"))) .
+         translate_lang_opt('en_US', 'el_GR', 'en_el',
+                            sprintf( _("%s to %s"),_("English"),_("Greek"))) .
+         translate_lang_opt('en_US', 'it_IT', 'en_it',
+                            sprintf( _("%s to %s"),_("English"),_("Italian"))) .
+         translate_lang_opt('en_US', 'ja_JP', 'en_ja',
+                            sprintf( _("%s to %s"),_("English"),_("Japanese"))) .
+         translate_lang_opt('en_US', 'ko_KR', 'en_ko',
+                            sprintf( _("%s to %s"),_("English"),_("Korean"))) .
+         translate_lang_opt('en_US', 'pt*',   'en_pt',
+                            sprintf( _("%s to %s"),_("English"),_("Portuguese"))) .
+         translate_lang_opt('en_US', 'ru_RU', 'en_ru',
+                            sprintf( _("%s to %s"),_("English"),_("Russian"))) .
+         translate_lang_opt('en_US', 'es_ES', 'en_es',
+                            sprintf( _("%s to %s"),_("English"),_("Spanish"))) .
+         translate_lang_opt('zh_CN',  '',     'zh_en',
+                            sprintf( _("%s to %s"),_("Simplified Chinese"),_("English"))) .
+         translate_lang_opt('zh_TW',  '',     'zt_en',
+                            sprintf( _("%s to %s"),_("Traditional Chinese"),_("English"))) .
+         translate_lang_opt('nl_NL',  '',     'nl_en',
+                            sprintf( _("%s to %s"),_("Dutch"),_("English"))) .
+         translate_lang_opt('fr_FR',  '',     'fr_en',
+                            sprintf( _("%s to %s"),_("French"),_("English"))) .
+         translate_lang_opt('de_DE', 'en_US', 'ge_en',
+                            sprintf( _("%s to %s"),_("German"),_("English"))) .
+         translate_lang_opt('el_GR', '',      'el_en',
+                            sprintf( _("%s to %s"),_("Greek"),_("English"))) .
+         translate_lang_opt('it_IT',  '',     'it_en',
+                            sprintf( _("%s to %s"),_("Italian"),_("English"))) .
+         translate_lang_opt('ja_JP',  '',     'ja_en',
+                            sprintf( _("%s to %s"),_("Japanese"),_("English"))) .
+         translate_lang_opt('ko_KR',  '',     'ko_en',
+                            sprintf( _("%s to %s"),_("Korean"),_("English"))) .
+         translate_lang_opt('pt*',    '',     'pt_en',
+                            sprintf( _("%s to %s"),_("Portuguese"),_("English"))) .
+         translate_lang_opt('ru_RU',  '',     'ru_en',
+                            sprintf( _("%s to %s"),_("Russian"),_("English"))) .
+         translate_lang_opt('es_ES',  '',     'es_en',
+                            sprintf( _("%s to %s"),_("Spanish"),_("English"))) .
          '</SELECT>'.
          'Dictionary.com: <INPUT TYPE="submit" VALUE="'._("Translate").'">';
 
   translate_table_end();
 }
 
+/**
+ * otenet translation engine
+ *
+ * @param string $message text that has to be translated
+ */
 function translate_form_otenet($message) {
     translate_new_form('http://systran.otenet.gr/cgi-bin/systran.cgi');
 ?>
@@ -540,93 +523,58 @@ function translate_form_otenet($message) {
     <INPUT NAME="partner" VALUE="OTEnet-en" type="hidden">
     <input type="hidden" name="urltext" value="<?php echo $message; ?>">
     <select name="lp" size="1"><?php
-        echo translate_lang_opt('en',  'el',  'en_el',
-                                sprintf( _("%s to %s"),
-                                         _("English"),
-                                         _("Greek"))) .
-             translate_lang_opt('el',  'en',  'el_en',
-                                sprintf( _("%s to %s"),
-                                         _("Greek"), 
-                                         _("English"))) .
-	     translate_lang_opt('fr',  'el',  'fr_el',
-                                sprintf( _("%s to %s"),
-                                         _("French"),
-                                         _("Greek"))) .
-	     translate_lang_opt('el',  'fr',  'el_fr',
-                                sprintf( _("%s to %s"),
-                                         _("Greek"),
-                                         _("French"))) .
+        echo translate_lang_opt('en_US', 'el_GR', 'en_el',
+                                sprintf( _("%s to %s"),_("English"),_("Greek"))) .
+             translate_lang_opt('el_GR', 'en_US', 'el_en',
+                                sprintf( _("%s to %s"),_("Greek"),_("English"))) .
+	     translate_lang_opt('fr_FR', '',      'fr_el',
+                                sprintf( _("%s to %s"),_("French"),_("Greek"))) .
+	     translate_lang_opt('el_GR', 'fr_FR', 'el_fr',
+                                sprintf( _("%s to %s"),_("Greek"),_("French"))) .
 	     translate_lang_opt('#',  '',  '', "----------------") .
-	     translate_lang_opt('en',  'fr',  'en_fr',
-                                sprintf( _("%s to %s"),
-                                         _("English"),
-                                         _("French"))) .
-	     translate_lang_opt('fr',  'en',  'fr_en',
-                                sprintf( _("%s to %s"),
-                                         _("French"),
-                                         _("English"))) .
-	     translate_lang_opt('en',  'de',  'en_de',
-                                sprintf( _("%s to %s"),
-                                         _("English"),
-                                         _("German"))) .
-	     translate_lang_opt('de',  'en',  'de_en',
-                                sprintf( _("%s to %s"),
-                                         _("German"),
-                                         _("English"))) .
-	     translate_lang_opt('en',  'es',  'en_es',
-                                sprintf( _("%s to %s"),
-                                         _("English"),
-                                         _("Spanish"))) .
-	     translate_lang_opt('es',  'en',  'es_en',
-                                sprintf( _("%s to %s"),
-                                         _("Spanish"),
-                                         _("English"))) .
-	     translate_lang_opt('en',  'it',  'en_it',
-                                sprintf( _("%s to %s"),
-                                         _("English"),
-                                         _("Italian"))) .
-	     translate_lang_opt('it',  'en',  'it_en',
-                                sprintf( _("%s to %s"),
-                                         _("Italian"),
-                                         _("English"))) .
-	     translate_lang_opt('en',  'pt',  'en_pt',
-                                sprintf( _("%s to %s"),
-                                         _("English"),
-                                         _("Portuguese"))) .
-	     translate_lang_opt('pt',  'en',  'pt_en',
-                                sprintf( _("%s to %s"),
-                                         _("Portuguese"),
-                                         _("English"))) .
-	     translate_lang_opt('fr',  'de',  'fr_de',
-                                sprintf( _("%s to %s"),
-                                         _("French"),
-                                         _("German"))) .
-	     translate_lang_opt('de',  'fr',  'de_fr',
-                                sprintf( _("%s to %s"),
-                                         _("German"),
-                                         _("French"))) .
-	     translate_lang_opt('fr',  'es',  'fr_es',
-                                sprintf( _("%s to %s"),
-                                         _("French"),
-                                         _("Spanish"))) .
-	     translate_lang_opt('es',  'fr',  'es_fr',
-                                sprintf( _("%s to %s"),
-                                         _("Spanish"),
-                                         _("French"))) .
-	     translate_lang_opt('fr',  'nl',  'fr_nl',
-                                sprintf( _("%s to %s"),
-                                         _("French"),
-                                         _("Dutch"))) .
-	     translate_lang_opt('nl',  'fr',  'nl_fr',
-                                sprintf( _("%s to %s"),
-                                         _("Dutch"),
-                                         _("French"))) ;
+	     translate_lang_opt('en_US', '',      'en_fr',
+                                sprintf( _("%s to %s"),_("English"),_("French"))) .
+	     translate_lang_opt('fr_FR', '',      'fr_en',
+                                sprintf( _("%s to %s"),_("French"),_("English"))) .
+	     translate_lang_opt('en_US', 'de_DE', 'en_de',
+                                sprintf( _("%s to %s"),_("English"),_("German"))) .
+	     translate_lang_opt('de_DE', '',      'de_en',
+                                sprintf( _("%s to %s"),_("German"),_("English"))) .
+	     translate_lang_opt('en_US', 'es_ES', 'en_es',
+                                sprintf( _("%s to %s"),_("English"),_("Spanish"))) .
+	     translate_lang_opt('es_ES', '',      'es_en',
+                                sprintf( _("%s to %s"),_("Spanish"),_("English"))) .
+	     translate_lang_opt('en_US', 'it_IT', 'en_it',
+                                sprintf( _("%s to %s"),_("English"),_("Italian"))) .
+	     translate_lang_opt('it_IT', '',      'it_en',
+                                sprintf( _("%s to %s"),_("Italian"),_("English"))) .
+	     translate_lang_opt('en_US', 'pt*',   'en_pt',
+                                sprintf( _("%s to %s"),_("English"),_("Portuguese"))) .
+	     translate_lang_opt('pt*',   '',      'pt_en',
+                                sprintf( _("%s to %s"),_("Portuguese"),_("English"))) .
+	     translate_lang_opt('fr_FR', '',      'fr_de',
+                                sprintf( _("%s to %s"),_("French"),_("German"))) .
+	     translate_lang_opt('de_DE', '',      'de_fr',
+                                sprintf( _("%s to %s"),_("German"),_("French"))) .
+	     translate_lang_opt('fr_FR', '',      'fr_es',
+                                sprintf( _("%s to %s"),_("French"),_("Spanish"))) .
+	     translate_lang_opt('es_ES', '',      'es_fr',
+                                sprintf( _("%s to %s"),_("Spanish"),_("French"))) .
+	     translate_lang_opt('fr_FR', 'nl_NL', 'fr_nl',
+                                sprintf( _("%s to %s"),_("French"),_("Dutch"))) .
+	     translate_lang_opt('nl_NL', '',      'nl_fr',
+                                sprintf( _("%s to %s"),_("Dutch"),_("French"))) ;
     echo '</select>'.
          'OTEnet: <input type="Submit" value="' . _("Translate") . '">';
     translate_table_end();
 
 }
 
+/**
+ * promt translation engine
+ *
+ * @param string $message text that has to be translated
+ */
 function translate_form_promt($message) {
     translate_new_form('http://www.translate.ru/text.asp#tr_form');
     echo '<input type="hidden" name="status" value="translate">';
@@ -641,54 +589,32 @@ function translate_form_promt($message) {
     echo "</select><br>\n";
     echo _("Translation direction")." : ";
     echo '<select size="1" id="direction" name="direction">';
-        echo translate_lang_opt('en',  'ru',  'er',
-                                sprintf( _("%s to %s"),
-                                         _("English"),
-                                         _("Russian"))) .
-             translate_lang_opt('ru',  'en',  're',
-                                sprintf( _("%s to %s"),
-                                         _("Russian"), 
-                                         _("English"))) .
-	     translate_lang_opt('de',  'ru',  'gr',
-                                sprintf( _("%s to %s"),
-                                         _("German"),
-                                         _("Russian"))) .
-	     translate_lang_opt('ru',  'de',  'rg',
-                                sprintf( _("%s to %s"),
-                                         _("Russian"),
-                                         _("German"))) .
-	     translate_lang_opt('fr',  'ru',  'fr',
-                                sprintf( _("%s to %s"),
-                                         _("French"),
-                                         _("Russian"))) .
-	     translate_lang_opt('ru',  'fr',  'rf',
-                                sprintf( _("%s to %s"),
-                                         _("Russian"),
-                                         _("French"))) .
-	     translate_lang_opt('es',  'ru',  'sr',
-                                sprintf( _("%s to %s"),
-                                         _("Spanish"),
-                                         _("Russian"))) .
-	     translate_lang_opt('it',  'ru',  'ir',
-                                sprintf( _("%s to %s"),
-                                         _("Italian"),
-                                         _("Russian"))) .
-	     translate_lang_opt('en',  'de',  'eg',
-                                sprintf( _("%s to %s"),
-                                         _("English"),
-                                         _("German"))) .
-	     translate_lang_opt('de',  'en',  'ge',
-                                sprintf( _("%s to %s"),
-                                         _("German"),
-                                         _("English"))) .
-	     translate_lang_opt('en',  'es',  'es',
-                                sprintf( _("%s to %s"),
-                                         _("English"),
-                                         _("Spanish"))) .
-	     translate_lang_opt('es',  'en',  'se',
-                                sprintf( _("%s to %s"),
-                                         _("Spanish"),
-                                         _("English"))) ;
+        echo translate_lang_opt('en_US', 'ru_RU', 'er',
+                                sprintf( _("%s to %s"),_("English"),_("Russian"))) .
+             translate_lang_opt('ru_RU', 'en_US', 're',
+                                sprintf( _("%s to %s"),_("Russian"),_("English"))) .
+	     translate_lang_opt('de_DE', '',      'gr',
+                                sprintf( _("%s to %s"),_("German"),_("Russian"))) .
+	     translate_lang_opt('ru_RU', 'de_DE', 'rg',
+                                sprintf( _("%s to %s"),_("Russian"),_("German"))) .
+	     translate_lang_opt('fr_FR',  '',     'fr',
+                                sprintf( _("%s to %s"),_("French"),_("Russian"))) .
+	     translate_lang_opt('ru_RU', 'fr_FR', 'rf',
+                                sprintf( _("%s to %s"),_("Russian"),_("French"))) .
+	     translate_lang_opt('es_ES', '',      'sr',
+                                sprintf( _("%s to %s"),_("Spanish"),_("Russian"))) .
+	     translate_lang_opt('ru_RU', 'es_ES', 'rs',
+                                sprintf( _("%s to %s"),_("Russian"),_("Spanish"))) .
+	     translate_lang_opt('it_IT', '',      'ir',
+                                sprintf( _("%s to %s"),_("Italian"),_("Russian"))) .
+	     translate_lang_opt('en_US', '',      'eg',
+                                sprintf( _("%s to %s"),_("English"),_("German"))) .
+	     translate_lang_opt('de_DE', '',      'ge',
+				sprintf( _("%s to %s"),_("German"),_("English"))) .
+	     translate_lang_opt('en_US', '',      'es',
+                                sprintf( _("%s to %s"),_("English"),_("Spanish"))) .
+	     translate_lang_opt('es_ES', '',  'se',
+                                sprintf( _("%s to %s"),_("Spanish"),_("English"))) ;
     echo "</select><br>\n";
     echo "<input type=\"hidden\" name=\"template\" value=\"General\">\n";
     echo 'PROMT: <input type="submit" value="' . _("Translate") . '">';
@@ -696,6 +622,11 @@ function translate_form_promt($message) {
     translate_table_end();
 }
 
+/**
+ * google translation engine
+ *
+ * @param string $message text that has to be translated
+ */
 function translate_form_google($message) {
     translate_new_form('http://www.google.com/translate_t');
 ?>
-- 
2.25.1