google translate options. rtl fixes.

git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@6324 7612ce4b-ef26-0410-bec9-ea0150e637f0

diff --git a/plugins/translate/options.php b/plugins/translate/options.php
index ed6170b7b73807a5743ca8652921c217818e31d8..72503ec453692c4aa53aca8d37d203de018fac5c 100644 (file)
--- a/plugins/translate/options.php
+++ b/plugins/translate/options.php
@@ -120,14 +120,18 @@ require_once(SM_PATH . 'include/load_prefs.php');
               _("No known limits, powered by Systran").
              "<br>".sprintf(_("Number of supported language pairs: %s"),"12")." " ,
               'http://www.dictionary.com/translate' );
-    ShowTrad( 'InterTran',
-              _("No known limits, powered by Translation Experts's InterTran").
-             "<br>".sprintf(_("Number of supported languages: %s"),"28")." " ,
-              'http://www.tranexp.com/' );
+    ShowTrad( 'Google Translate',
+              _("No known limits, powered by Systran").
+             "<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")." " ,
               'http://www.translator.cx/' );
+    ShowTrad( 'InterTran',
+              _("No known limits, powered by Translation Experts's InterTran").
+             "<br>".sprintf(_("Number of supported languages: %s"),"28")." " ,
+              'http://www.tranexp.com/' );
     ShowTrad( 'OTEnet',
               _("Hellenic translations, no known limits, powered by Systran").
              "<br>".sprintf(_("Number of supported language pairs: %s"),"20")." " ,
@@ -151,15 +155,14 @@ require_once(SM_PATH . 'include/load_prefs.php');
     ShowOption('server', 'babelfish', 'Babelfish');
 //    ShowOption('server', 'go', 'Go.com');
     ShowOption('server', 'dictionary', 'Dictionary.com');
-    ShowOption('server', 'intertran', 'Intertran');
-    ShowOption('server', 'gpltrans', 'GPLTrans');
-    ShowOption('server', 'otenet', 'OTEnet');
+   ShowOption('server', 'google', 'Google Translate');
+   ShowOption('server', 'gpltrans', 'GPLTrans'); 
+   ShowOption('server', 'intertran', 'Intertran');
+     ShowOption('server', 'otenet', 'OTEnet');
     ShowOption('server', 'promt', 'PROMT');
     echo '</select>' .
          '</td></tr>' .
-         '<tr><td align=right nowrap>' .
-         _("When reading:") .
-         '</td>'.
+         '<tr>'.html_tag('td',_("When reading:"),'right','','nowrap').
          '<td><input type=checkbox name="translate_translate_show_read"';
     if ($translate_show_read)
         echo " CHECKED";
@@ -174,8 +177,7 @@ require_once(SM_PATH . 'include/load_prefs.php');
         echo " CHECKED";
     echo '> - ' . _("Translate inside the SquirrelMail frames").
          '</td></tr>'.
-         '<tr><td align=right nowrap>'.
-         _("When composing:") . '</td>'.
+         '<tr>'.html_tag('td',_("When composing:"),'right','','nowrap').
          '<td><input type=checkbox name="translate_translate_show_send"';
    if ($translate_show_send)
      echo " CHECKED";

diff --git a/plugins/translate/setup.php b/plugins/translate/setup.php
index af6f7204c840a18c89083dc0d1a849493f9abd32..ccabd482ba4ec565e3a482053d4607ce277db762 100644 (file)
--- a/plugins/translate/setup.php
+++ b/plugins/translate/setup.php
@@ -149,7 +149,7 @@ function translate_pref() {
 
 
 /**
- * This function could be sped up.
+ * 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.
  */
@@ -395,7 +395,7 @@ function translate_form_intertran($message) {
         translate_lang_opt('',      '',    'spe', _("European Spanish")).
         translate_lang_opt('',      '',    'fin', _("Finnish")).
         translate_lang_opt('fr',    '',    'fre', _("French")).
-        translate_lang_opt('de',    '',    'ger', _("German")).
+        translate_lang_opt('de_DE', '',    'ger', _("German")).
         translate_lang_opt('',      '',    'grk', _("Greek")).
         translate_lang_opt('',      '',    'hun', _("Hungarian") . ' (CP 1250)').
         translate_lang_opt('',      '',    'ice', _("Icelandic")).
@@ -426,7 +426,7 @@ function translate_form_intertran($message) {
         translate_lang_opt('',    '',      'spe', _("European Spanish")).
         translate_lang_opt('',    '',      'fin', _("Finnish")).
         translate_lang_opt('',    'fr',    'fre', _("French")).
-        translate_lang_opt('',    'de',    'ger', _("German")).
+        translate_lang_opt('',    'de_DE',    'ger', _("German")).
         translate_lang_opt('',    '',      'grk', _("Greek")).
         translate_lang_opt('',    '',      'hun', _("Hungarian") . ' (CP 1250)').
         translate_lang_opt('',    '',      'ice', _("Icelandic")).
@@ -696,4 +696,42 @@ function translate_form_promt($message) {
     translate_table_end();
 }
 
+function translate_form_google($message) {
+    translate_new_form('http://www.google.com/translate_t');
+?>
+    <input type="hidden" name="ie" value="Unknown">
+    <input type="hidden" name="oe" value="ASCII">
+    <input type="hidden" name="hl" value="en">
+    <input type="hidden" name="text" value="<?php echo $message; ?>">
+    <select name="langpair"><?php
+        echo translate_lang_opt('en_US', 'de_DE', 'en|de',
+                               sprintf( _("%s to %s"),_("English"),_("German"))) .
+            translate_lang_opt('en_US', 'es_ES',  'en|es',
+                               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', '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('de_DE', 'en_US', 'de|en',
+                                sprintf( _("%s to %s"),_("German"),_("English"))) .
+             translate_lang_opt('de_DE', '', 'de|fr',
+                                sprintf( _("%s to %s"),_("German"),_("French"))) .
+             translate_lang_opt('es_ES', '', 'es|en',
+                                sprintf( _("%s to %s"),_("Spanish"),_("English"))) .
+             translate_lang_opt('fr_FR', '', 'fr|en',
+                                sprintf( _("%s to %s"),_("French"),_("English"))) .
+             translate_lang_opt('fr_FR', '', 'fr|de',
+                               sprintf( _("%s to %s"),_("French"),_("German"))) .
+             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>'.
+         'Google: <input type="Submit" value="' . _("Translate") . '">';
+
+    translate_table_end();
+}
+
 ?>