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

release-0.6
alecpl 14 years ago
parent eeb34ba356
commit 1fb718cae0

@ -10,6 +10,7 @@ CHANGELOG RoundCube Webmail
- Fix SMTP test in Installer (#1486952) - Fix SMTP test in Installer (#1486952)
- Fix "Select all" causes message to be opened in folder with exactly one message (#1486913) - 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 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 RELEASE 0.4
----------- -----------

@ -1505,7 +1505,11 @@ function rcube_html_editor($mode='')
if ($hook['abort']) if ($hook['abort'])
return; 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')) if (!file_exists(INSTALL_PATH . 'program/js/tiny_mce/langs/'.$lang.'.js'))
$lang = 'en'; $lang = 'en';

Loading…
Cancel
Save