bug #3965 Default language wrong with zh-TW

This commit is contained in:
Marc Delisle 2013-06-06 11:38:55 -04:00
parent d550ae54b2
commit 46d0c48121
2 changed files with 8 additions and 1 deletions

View File

@ -7,6 +7,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

View File

@ -336,7 +336,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);
}