Changeset 3910 in subversion

Timestamp:

Aug 27, 2010 7:27:28 AM (3 years ago)

Author:

alec

Message:

• Fix TinyMCE uses zh_CN when zh_TW locale is set (#1486929)

Location:

trunk/roundcubemail

Files:

• CHANGELOG (modified) (1 diff)
• program/include/main.inc (modified) (1 diff)

trunk/roundcubemail/CHANGELOG

@@ -11 +11 @@
 - Fix "Select all" causes message to be opened in folder with exactly one message (#1486913)
 - Fix Tab key doesn't work in HTML editor in Google Chrome (#1486925)
+- Fix TinyMCE uses zh_CN when zh_TW locale is set (#1486929)
 
 RELEASE 0.4

trunk/roundcubemail/program/include/main.inc

@@ -1506 +1506 @@
     return;  
 
-  $lang = strtolower(substr($_SESSION['language'], 0, 2));
+  $lang = strtolower($_SESSION['language']);
+
+  // TinyMCE uses 'tw' for zh_TW (which is wrong, because tw is a code of Twi language)
+  $lang = ($lang == 'zh_tw') ? 'tw' : substr($lang, 0, 2);
+
   if (!file_exists(INSTALL_PATH . 'program/js/tiny_mce/langs/'.$lang.'.js'))
     $lang = 'en';