diff --git a/ChangeLog b/ChangeLog index 7951b4dc5f..c4161b8cb9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -22,6 +22,7 @@ phpMyAdmin - ChangeLog - bug #3897 Row Statistics and Space usage bugs - bug #3966 Only display "table has no unique column" message when applicable - bug #3960 NavigationBarIconic config not honored +- bug #3965 Default language wrong with zh-TW 4.0.3.0 (2013-06-05) - bug #3941 Recent tables list always empty diff --git a/libraries/select_lang.lib.php b/libraries/select_lang.lib.php index b11e28d0f4..a14f5e897c 100644 --- a/libraries/select_lang.lib.php +++ b/libraries/select_lang.lib.php @@ -340,7 +340,13 @@ function PMA_langDetails($lang) case 'zh_TW': return array('zh[-_](tw|hk)|chinese traditional', 'zh-TW', '中文'); case 'zh_CN': - return array('zh|chinese simplified', 'zh', '中文'); + // only TW and HK use traditional Chinese while others (CN, SG, MY) + // use simplified Chinese + return array( + 'zh(?![-_](tw|hk))([-_][[:alpha:]]{2,3})?|chinese simplified', + 'zh', + '中文' + ); } return array("$lang|$lang", $lang, $lang); }