From 1fb718cae02c6929c1b31562f05eddc32ae3be17 Mon Sep 17 00:00:00 2001
From: alecpl <alec@alec.pl>
Date: Fri, 27 Aug 2010 07:27:28 -0400
Subject: [PATCH] - Fix TinyMCE uses zh_CN when zh_TW locale is set (#1486929)
---
CHANGELOG | 1 +
program/include/main.inc | 6 +++++-
2 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/CHANGELOG b/CHANGELOG
index 83ad13f..fbc3ee0 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -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
-----------
diff --git a/program/include/main.inc b/program/include/main.inc
index f9ce547..fa5534f 100644
--- a/program/include/main.inc
+++ b/program/include/main.inc
@@ -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';
--
Gitblit v1.9.1