[Svn] r3910 - in trunk/roundcubemail: . program/include

trac at roundcube.net trac at roundcube.net
Fri Aug 27 13:27:32 CEST 2010


Author: alec
Date: 2010-08-27 06:27:28 -0500 (Fri, 27 Aug 2010)
New Revision: 3910

Modified:
   trunk/roundcubemail/CHANGELOG
   trunk/roundcubemail/program/include/main.inc
Log:
- Fix TinyMCE uses zh_CN when zh_TW locale is set (#1486929) 


Modified: trunk/roundcubemail/CHANGELOG
===================================================================
--- trunk/roundcubemail/CHANGELOG	2010-08-27 10:35:37 UTC (rev 3909)
+++ trunk/roundcubemail/CHANGELOG	2010-08-27 11:27:28 UTC (rev 3910)
@@ -10,6 +10,7 @@
 - Fix SMTP test in Installer (#1486952)
 - 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
 -----------

Modified: trunk/roundcubemail/program/include/main.inc
===================================================================
--- trunk/roundcubemail/program/include/main.inc	2010-08-27 10:35:37 UTC (rev 3909)
+++ trunk/roundcubemail/program/include/main.inc	2010-08-27 11:27:28 UTC (rev 3910)
@@ -1505,7 +1505,11 @@
   if ($hook['abort'])
     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';
 

_______________________________________________
http://lists.roundcube.net/mailman/listinfo/svn



More information about the Svn mailing list