X-Git-Url: https://vcs.fsf.org/?p=squirrelmail.git;a=blobdiff_plain;f=plugins%2Ftranslate%2Ffunctions.php;h=b6831866bc9f11710c57c8bb851d0c607a99af8f;hp=7f2c6458bb4a2afdaa4ec3b1582f45cc4781c9ff;hb=353d074afac6827c90f4bb03e846c5e453d3b5b1;hpb=c141811060fdc619f178a5e4571459b2b37b3bf9

diff --git a/plugins/translate/functions.php b/plugins/translate/functions.php
index 7f2c6458..b6831866 100644
--- a/plugins/translate/functions.php
+++ b/plugins/translate/functions.php
@@ -3,7 +3,7 @@
 /**
  * SquirrelMail translate plugin functions
  *
- * @copyright © 2004-2006 The SquirrelMail Project Team
+ * @copyright 2004-2018 The SquirrelMail Project Team
  * @license http://opensource.org/licenses/gpl-license.php GNU Public License
  * @version $Id$
  * @package plugins
@@ -13,8 +13,7 @@
 /**
  * do not allow to call this file directly
  */
-if ((isset($_SERVER['SCRIPT_FILENAME']) && $_SERVER['SCRIPT_FILENAME'] == __FILE__) ||
-     (isset($HTTP_SERVER_SERVER['SCRIPT_FILENAME']) && $HTTP_SERVER_SERVER['SCRIPT_FILENAME'] == __FILE__) ) {
+if (isset($_SERVER['SCRIPT_FILENAME']) && $_SERVER['SCRIPT_FILENAME'] == __FILE__) {
     header("Location: ../../src/login.php");
     die();
 }
@@ -457,7 +456,7 @@ function translate_new_form($action,$charset=null) {
     }
 
     if (! is_null($charset))
-        echo ' accept-charset="'.htmlspecialchars($charset).'"';
+        echo ' accept-charset="'.sm_encode_html_special_chars($charset).'"';
 
     echo ">\n";
 
@@ -928,7 +927,7 @@ function translate_form_google($message) {
          translate_lang_opt('en_US', 'ko_KR', 'en|ko',
                             sprintf( _("%s to %s"),_("English"),_("Korean"))) .
          translate_lang_opt('en_US', 'zh_CN', 'en|zh-CN',
-                            sprintf( _("%s to %s"),_("English"),_("Chinese (Simplified)"))) .
+                            sprintf( _("%s to %s"),_("English"),_("Chinese, Simplified"))) .
          translate_lang_opt('de_DE', 'en_US', 'de|en',
                             sprintf( _("%s to %s"),_("German"),_("English"))) .
          translate_lang_opt('de_DE', '', 'de|fr',
@@ -950,7 +949,7 @@ function translate_form_google($message) {
          translate_lang_opt('ko_KR', '', 'ko|en',
                             sprintf( _("%s to %s"),_("Korean"),_("English"))).
          translate_lang_opt('zh_CN', '', 'zh-CN|en',
-                            sprintf( _("%s to %s"),_("Chinese (Simplified)"),_("English")));
+                            sprintf( _("%s to %s"),_("Chinese, Simplified"),_("English")));
     echo '</select>'.
         '<input type="hidden" name="hl" value="en" />' .
         '<input type="hidden" name="ie" value="UTF8" />' .