nettika/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

language detection improvements

Browse Source
This commit is contained in:
Michal Čihař
2004-05-25 14:57:10 +00:00
parent e727bb668e
commit 40844c8169
3 changed files with 118 additions and 107 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@@ -5,6 +5,12 @@ phpMyAdmin - Changelog
$Id$
$Source$
2004-05-25 Michal Čihař <michal@cihar.com>
* main.php, libraries/select_lang.lib.php: Use pma_lang cookie instead of
just lang.
* libraries/select_lang.lib.php: Fix language dialects detection (based on
patch #958994).
2004-05-23 Garvin Hicking <pma@supergarv.de>
* db_details.php: Fixed broken file upload since redesign-patch.

217
libraries/select_lang.lib.php
View File

@@ -32,7 +32,8 @@ $lang_path = 'lang/';
* These values contains:
* - the "official" ISO language code and, if required, the dialect code
* also ('bu' for Bulgarian, 'fr([-_][[:alpha:]]{2})?' for all French
* dialects, 'zh[-_]tw' for Chinese traditional...);
* dialects, 'zh[-_]tw' for Chinese traditional...), the dialect has to
* be specified as first;
* - the '|' character (it means 'OR');
* - the full language name.
* 3. The second values associated to the key is the name of the file to load
@@ -52,107 +53,107 @@ $lang_path = 'lang/';
* and users would not see anything.
*/
$available_languages = array(
'af-utf-8' => array('af|afrikaans', 'afrikaans-utf-8', 'af'),
'af-iso-8859-1'=> array('af|afrikaans', 'afrikaans-iso-8859-1', 'af'),
'ar-utf-8' => array('ar([-_][[:alpha:]]{2})?|arabic', 'arabic-utf-8', 'ar'),
'ar-win1256' => array('ar([-_][[:alpha:]]{2})?|arabic', 'arabic-windows-1256', 'ar'),
'az-utf-8' => array('az|azerbaijani', 'azerbaijani-utf-8', 'az'),
'az-iso-8859-9'=> array('az|azerbaijani', 'azerbaijani-iso-8859-9', 'az'),
'bg-utf-8' => array('bg|bulgarian', 'bulgarian-utf-8', 'bg'),
'bg-win1251' => array('bg|bulgarian', 'bulgarian-windows-1251', 'bg'),
'bg-koi8-r' => array('bg|bulgarian', 'bulgarian-koi8-r', 'bg'),
'bs-utf-8' => array('bs|bosnian', 'bosnian-utf-8', 'bs'),
'bs-win1250' => array('bs|bosnian', 'bosnian-windows-1250', 'bs'),
'ca-utf-8' => array('ca|catalan', 'catalan-utf-8', 'ca'),
'ca-iso-8859-1'=> array('ca|catalan', 'catalan-iso-8859-1', 'ca'),
'cs-utf-8' => array('cs|czech', 'czech-utf-8', 'cs'),
'cs-iso-8859-2'=> array('cs|czech', 'czech-iso-8859-2', 'cs'),
'cs-win1250' => array('cs|czech', 'czech-windows-1250', 'cs'),
'da-utf-8' => array('da|danish', 'danish-utf-8', 'da'),
'da-iso-8859-1'=> array('da|danish', 'danish-iso-8859-1', 'da'),
'de-utf-8' => array('de([-_][[:alpha:]]{2})?|german', 'german-utf-8', 'de'),
'de-iso-8859-1'=> array('de([-_][[:alpha:]]{2})?|german', 'german-iso-8859-1', 'de'),
'el-utf-8' => array('el|greek', 'greek-utf-8', 'el'),
'el-iso-8859-7'=> array('el|greek', 'greek-iso-8859-7', 'el'),
'en-utf-8' => array('en([-_][[:alpha:]]{2})?|english', 'english-utf-8', 'en'),
'en-iso-8859-1'=> array('en([-_][[:alpha:]]{2})?|english', 'english-iso-8859-1', 'en'),
'es-utf-8' => array('es([-_][[:alpha:]]{2})?|spanish', 'spanish-utf-8', 'es'),
'es-iso-8859-1'=> array('es([-_][[:alpha:]]{2})?|spanish', 'spanish-iso-8859-1', 'es'),
'et-utf-8' => array('et|estonian', 'estonian-utf-8', 'et'),
'et-iso-8859-1'=> array('et|estonian', 'estonian-iso-8859-1', 'et'),
'eu-utf-8' => array('eu|basque', 'basque-utf-8', 'eu'),
'eu-iso-8859-1'=> array('eu|basque', 'basque-iso-8859-1', 'eu'),
'fa-utf-8' => array('fa|persian', 'persian-utf-8', 'fa'),
'fa-win1256' => array('fa|persian', 'persian-windows-1256', 'fa'),
'fi-utf-8' => array('fi|finnish', 'finnish-utf-8', 'fi'),
'fi-iso-8859-1'=> array('fi|finnish', 'finnish-iso-8859-1', 'fi'),
'fr-utf-8' => array('fr([-_][[:alpha:]]{2})?|french', 'french-utf-8', 'fr'),
'fr-iso-8859-1'=> array('fr([-_][[:alpha:]]{2})?|french', 'french-iso-8859-1', 'fr'),
'gl-utf-8' => array('gl|galician', 'galician-utf-8', 'gl'),
'gl-iso-8859-1'=> array('gl|galician', 'galician-iso-8859-1', 'gl'),
'he-iso-8859-8-i'=> array('he|hebrew', 'hebrew-iso-8859-8-i', 'he'),
'hi-utf-8' => array('hi|hindi', 'hindi-utf-8', 'hi'),
'hr-utf-8' => array('hr|croatian', 'croatian-utf-8', 'hr'),
'hr-win1250' => array('hr|croatian', 'croatian-windows-1250', 'hr'),
'hr-iso-8859-2'=> array('hr|croatian', 'croatian-iso-8859-2', 'hr'),
'hu-utf-8' => array('hu|hungarian', 'hungarian-utf-8', 'hu'),
'hu-iso-8859-2'=> array('hu|hungarian', 'hungarian-iso-8859-2', 'hu'),
'id-utf-8' => array('id|indonesian', 'indonesian-utf-8', 'id'),
'id-iso-8859-1'=> array('id|indonesian', 'indonesian-iso-8859-1', 'id'),
'it-utf-8' => array('it|italian', 'italian-utf-8', 'it'),
'it-iso-8859-1'=> array('it|italian', 'italian-iso-8859-1', 'it'),
'ja-utf-8' => array('ja|japanese', 'japanese-utf-8', 'ja'),
'ja-euc' => array('ja|japanese', 'japanese-euc', 'ja'),
'ja-sjis' => array('ja|japanese', 'japanese-sjis', 'ja'),
'ko-euc-kr' => array('ko|korean', 'korean-euc-kr', 'ko'),
'ko-utf-8' => array('ko|korean', 'korean-utf-8', 'ko'),
'ka-utf-8' => array('ka|georgian', 'georgian-utf-8', 'ka'),
'lt-utf-8' => array('lt|lithuanian', 'lithuanian-utf-8', 'lt'),
'lt-win1257' => array('lt|lithuanian', 'lithuanian-windows-1257', 'lt'),
'lv-utf-8' => array('lv|latvian', 'latvian-utf-8', 'lv'),
'lv-win1257' => array('lv|latvian', 'latvian-windows-1257', 'lv'),
'ms-utf-8' => array('ms|malay', 'malay-utf-8', 'ms'),
'ms-iso-8859-1'=> array('ms|malay', 'malay-iso-8859-1', 'ms'),
'nl-utf-8' => array('nl([-_][[:alpha:]]{2})?|dutch', 'dutch-utf-8', 'nl'),
'nl-iso-8859-1'=> array('nl([-_][[:alpha:]]{2})?|dutch', 'dutch-iso-8859-1', 'nl'),
'no-utf-8' => array('no|norwegian', 'norwegian-utf-8', 'no'),
'no-iso-8859-1'=> array('no|norwegian', 'norwegian-iso-8859-1', 'no'),
'pl-utf-8' => array('pl|polish', 'polish-utf-8', 'pl'),
'pl-iso-8859-2'=> array('pl|polish', 'polish-iso-8859-2', 'pl'),
'pt-br-utf-8' => array('pt[-_]br|brazilian portuguese', 'brazilian_portuguese-utf-8', 'pt-BR'),
'pt-br-iso-8859-1' => array('pt[-_]br|brazilian portuguese', 'brazilian_portuguese-iso-8859-1', 'pt-BR'),
'pt-utf-8' => array('pt([-_][[:alpha:]]{2})?|portuguese', 'portuguese-utf-8', 'pt'),
'pt-iso-8859-1'=> array('pt([-_][[:alpha:]]{2})?|portuguese', 'portuguese-iso-8859-1', 'pt'),
'ro-utf-8' => array('ro|romanian', 'romanian-utf-8', 'ro'),
'ro-iso-8859-1'=> array('ro|romanian', 'romanian-iso-8859-1', 'ro'),
'ru-win1251' => array('ru|russian', 'russian-windows-1251', 'ru'),
'ru-utf-8' => array('ru|russian', 'russian-utf-8', 'ru'),
'ru-cp-866' => array('ru|russian', 'russian-cp-866', 'ru'),
'ru-koi8-r' => array('ru|russian', 'russian-koi8-r', 'ru'),
'sk-utf-8' => array('sk|slovak', 'slovak-utf-8', 'sk'),
'sk-iso-8859-2'=> array('sk|slovak', 'slovak-iso-8859-2', 'sk'),
'sk-win1250' => array('sk|slovak', 'slovak-windows-1250', 'sk'),
'sl-utf-8' => array('sl|slovenian', 'slovenian-utf-8', 'sl'),
'sl-iso-8859-2'=> array('sl|slovenian', 'slovenian-iso-8859-2', 'sl'),
'sl-win1250' => array('sl|slovenian', 'slovenian-windows-1250', 'sl'),
'sq-utf-8' => array('sq|albanian', 'albanian-utf-8', 'sq'),
'sq-iso-8859-1'=> array('sq|albanian', 'albanian-iso-8859-1', 'sq'),
'sr-utf-8' => array('sr|serbian', 'serbian_cyrillic-utf-8', 'sr'),
'sr-win1251' => array('sr|serbian', 'serbian_cyrillic-windows-1251', 'sr'),
'sr-lat-utf-8' => array('sr[-_]lat|serbian latin', 'serbian_latin-utf-8', 'sr-lat'),
'sr-lat-win1250'=> array('sr[-_]lat|serbian latin', 'serbian_latin-windows-1250', 'sr-lat'),
'sv-utf-8' => array('sv|swedish', 'swedish-utf-8', 'sv'),
'sv-iso-8859-1'=> array('sv|swedish', 'swedish-iso-8859-1', 'sv'),
'th-utf-8' => array('th|thai', 'thai-utf-8', 'th'),
'th-tis-620' => array('th|thai', 'thai-tis-620', 'th'),
'tr-utf-8' => array('tr|turkish', 'turkish-utf-8', 'tr'),
'tr-iso-8859-9'=> array('tr|turkish', 'turkish-iso-8859-9', 'tr'),
'uk-utf-8' => array('uk|ukrainian', 'ukrainian-utf-8', 'uk'),
'uk-win1251' => array('uk|ukrainian', 'ukrainian-windows-1251', 'uk'),
'zh-tw-utf-8' => array('zh[-_]tw|chinese traditional', 'chinese_big5-utf-8', 'zh-TW'),
'zh-tw' => array('zh[-_]tw|chinese traditional', 'chinese_big5', 'zh-TW'),
'zh-utf-8' => array('zh|chinese simplified', 'chinese_gb-utf-8', 'zh'),
'zh' => array('zh|chinese simplified', 'chinese_gb', 'zh')
'af-utf-8' => array('af|afrikaans', 'afrikaans-utf-8', 'af'),
'af-iso-8859-1' => array('af|afrikaans', 'afrikaans-iso-8859-1', 'af'),
'ar-utf-8' => array('ar|arabic', 'arabic-utf-8', 'ar'),
'ar-win1256' => array('ar|arabic', 'arabic-windows-1256', 'ar'),
'az-utf-8' => array('az|azerbaijani', 'azerbaijani-utf-8', 'az'),
'az-iso-8859-9' => array('az|azerbaijani', 'azerbaijani-iso-8859-9', 'az'),
'bg-utf-8' => array('bg|bulgarian', 'bulgarian-utf-8', 'bg'),
'bg-win1251' => array('bg|bulgarian', 'bulgarian-windows-1251', 'bg'),
'bg-koi8-r' => array('bg|bulgarian', 'bulgarian-koi8-r', 'bg'),
'bs-utf-8' => array('bs|bosnian', 'bosnian-utf-8', 'bs'),
'bs-win1250' => array('bs|bosnian', 'bosnian-windows-1250', 'bs'),
'ca-utf-8' => array('ca|catalan', 'catalan-utf-8', 'ca'),
'ca-iso-8859-1' => array('ca|catalan', 'catalan-iso-8859-1', 'ca'),
'cs-utf-8' => array('cs|czech', 'czech-utf-8', 'cs'),
'cs-iso-8859-2' => array('cs|czech', 'czech-iso-8859-2', 'cs'),
'cs-win1250' => array('cs|czech', 'czech-windows-1250', 'cs'),
'da-utf-8' => array('da|danish', 'danish-utf-8', 'da'),
'da-iso-8859-1' => array('da|danish', 'danish-iso-8859-1', 'da'),
'de-utf-8' => array('de|german', 'german-utf-8', 'de'),
'de-iso-8859-1' => array('de|german', 'german-iso-8859-1', 'de'),
'el-utf-8' => array('el|greek', 'greek-utf-8', 'el'),
'el-iso-8859-7' => array('el|greek', 'greek-iso-8859-7', 'el'),
'en-utf-8' => array('en|english', 'english-utf-8', 'en'),
'en-iso-8859-1' => array('en|english', 'english-iso-8859-1', 'en'),
'es-utf-8' => array('es|spanish', 'spanish-utf-8', 'es'),
'es-iso-8859-1' => array('es|spanish', 'spanish-iso-8859-1', 'es'),
'et-utf-8' => array('et|estonian', 'estonian-utf-8', 'et'),
'et-iso-8859-1' => array('et|estonian', 'estonian-iso-8859-1', 'et'),
'eu-utf-8' => array('eu|basque', 'basque-utf-8', 'eu'),
'eu-iso-8859-1' => array('eu|basque', 'basque-iso-8859-1', 'eu'),
'fa-utf-8' => array('fa|persian', 'persian-utf-8', 'fa'),
'fa-win1256' => array('fa|persian', 'persian-windows-1256', 'fa'),
'fi-utf-8' => array('fi|finnish', 'finnish-utf-8', 'fi'),
'fi-iso-8859-1' => array('fi|finnish', 'finnish-iso-8859-1', 'fi'),
'fr-utf-8' => array('fr|french', 'french-utf-8', 'fr'),
'fr-iso-8859-1' => array('fr|french', 'french-iso-8859-1', 'fr'),
'gl-utf-8' => array('gl|galician', 'galician-utf-8', 'gl'),
'gl-iso-8859-1' => array('gl|galician', 'galician-iso-8859-1', 'gl'),
'he-iso-8859-8-i' => array('he|hebrew', 'hebrew-iso-8859-8-i', 'he'),
'hi-utf-8' => array('hi|hindi', 'hindi-utf-8', 'hi'),
'hr-utf-8' => array('hr|croatian', 'croatian-utf-8', 'hr'),
'hr-win1250' => array('hr|croatian', 'croatian-windows-1250', 'hr'),
'hr-iso-8859-2' => array('hr|croatian', 'croatian-iso-8859-2', 'hr'),
'hu-utf-8' => array('hu|hungarian', 'hungarian-utf-8', 'hu'),
'hu-iso-8859-2' => array('hu|hungarian', 'hungarian-iso-8859-2', 'hu'),
'id-utf-8' => array('id|indonesian', 'indonesian-utf-8', 'id'),
'id-iso-8859-1' => array('id|indonesian', 'indonesian-iso-8859-1', 'id'),
'it-utf-8' => array('it|italian', 'italian-utf-8', 'it'),
'it-iso-8859-1' => array('it|italian', 'italian-iso-8859-1', 'it'),
'ja-utf-8' => array('ja|japanese', 'japanese-utf-8', 'ja'),
'ja-euc' => array('ja|japanese', 'japanese-euc', 'ja'),
'ja-sjis' => array('ja|japanese', 'japanese-sjis', 'ja'),
'ko-euc-kr' => array('ko|korean', 'korean-euc-kr', 'ko'),
'ko-utf-8' => array('ko|korean', 'korean-utf-8', 'ko'),
'ka-utf-8' => array('ka|georgian', 'georgian-utf-8', 'ka'),
'lt-utf-8' => array('lt|lithuanian', 'lithuanian-utf-8', 'lt'),
'lt-win1257' => array('lt|lithuanian', 'lithuanian-windows-1257', 'lt'),
'lv-utf-8' => array('lv|latvian', 'latvian-utf-8', 'lv'),
'lv-win1257' => array('lv|latvian', 'latvian-windows-1257', 'lv'),
'ms-utf-8' => array('ms|malay', 'malay-utf-8', 'ms'),
'ms-iso-8859-1' => array('ms|malay', 'malay-iso-8859-1', 'ms'),
'nl-utf-8' => array('nl|dutch', 'dutch-utf-8', 'nl'),
'nl-iso-8859-1' => array('nl|dutch', 'dutch-iso-8859-1', 'nl'),
'no-utf-8' => array('no|norwegian', 'norwegian-utf-8', 'no'),
'no-iso-8859-1' => array('no|norwegian', 'norwegian-iso-8859-1', 'no'),
'pl-utf-8' => array('pl|polish', 'polish-utf-8', 'pl'),
'pl-iso-8859-2' => array('pl|polish', 'polish-iso-8859-2', 'pl'),
'pt-br-utf-8' => array('pt[-_]br|brazilian portuguese', 'brazilian_portuguese-utf-8', 'pt-BR'),
'pt-br-iso-8859-1' => array('pt[-_]br|brazilian portuguese', 'brazilian_portuguese-iso-8859-1', 'pt-BR'),
'pt-utf-8' => array('pt|portuguese', 'portuguese-utf-8', 'pt'),
'pt-iso-8859-1' => array('pt|portuguese', 'portuguese-iso-8859-1', 'pt'),
'ro-utf-8' => array('ro|romanian', 'romanian-utf-8', 'ro'),
'ro-iso-8859-1' => array('ro|romanian', 'romanian-iso-8859-1', 'ro'),
'ru-win1251' => array('ru|russian', 'russian-windows-1251', 'ru'),
'ru-utf-8' => array('ru|russian', 'russian-utf-8', 'ru'),
'ru-cp-866' => array('ru|russian', 'russian-cp-866', 'ru'),
'ru-koi8-r' => array('ru|russian', 'russian-koi8-r', 'ru'),
'sk-utf-8' => array('sk|slovak', 'slovak-utf-8', 'sk'),
'sk-iso-8859-2' => array('sk|slovak', 'slovak-iso-8859-2', 'sk'),
'sk-win1250' => array('sk|slovak', 'slovak-windows-1250', 'sk'),
'sl-utf-8' => array('sl|slovenian', 'slovenian-utf-8', 'sl'),
'sl-iso-8859-2' => array('sl|slovenian', 'slovenian-iso-8859-2', 'sl'),
'sl-win1250' => array('sl|slovenian', 'slovenian-windows-1250', 'sl'),
'sq-utf-8' => array('sq|albanian', 'albanian-utf-8', 'sq'),
'sq-iso-8859-1' => array('sq|albanian', 'albanian-iso-8859-1', 'sq'),
'sr-lat-utf-8' => array('sr[-_]lat|serbian latin', 'serbian_latin-utf-8', 'sr-lat'),
'sr-lat-win1250' => array('sr[-_]lat|serbian latin', 'serbian_latin-windows-1250', 'sr-lat'),
'sr-utf-8' => array('sr|serbian', 'serbian_cyrillic-utf-8', 'sr'),
'sr-win1251' => array('sr|serbian', 'serbian_cyrillic-windows-1251', 'sr'),
'sv-utf-8' => array('sv|swedish', 'swedish-utf-8', 'sv'),
'sv-iso-8859-1' => array('sv|swedish', 'swedish-iso-8859-1', 'sv'),
'th-utf-8' => array('th|thai', 'thai-utf-8', 'th'),
'th-tis-620' => array('th|thai', 'thai-tis-620', 'th'),
'tr-utf-8' => array('tr|turkish', 'turkish-utf-8', 'tr'),
'tr-iso-8859-9' => array('tr|turkish', 'turkish-iso-8859-9', 'tr'),
'uk-utf-8' => array('uk|ukrainian', 'ukrainian-utf-8', 'uk'),
'uk-win1251' => array('uk|ukrainian', 'ukrainian-windows-1251', 'uk'),
'zh-tw-utf-8' => array('zh[-_]tw|chinese traditional', 'chinese_big5-utf-8', 'zh-TW'),
'zh-tw' => array('zh[-_]tw|chinese traditional', 'chinese_big5', 'zh-TW'),
'zh-utf-8' => array('zh|chinese simplified', 'chinese_gb-utf-8', 'zh'),
'zh' => array('zh|chinese simplified', 'chinese_gb', 'zh')
);
@@ -176,8 +177,12 @@ function PMA_langDetect($str = '', $envType = '')
foreach ($available_languages AS $key => $value) {
// $envType = 1 for the 'HTTP_ACCEPT_LANGUAGE' environment variable,
// 2 for the 'HTTP_USER_AGENT' one
if (($envType == 1 && eregi('^(' . $value[0] . ')(;q=[0-9]\\.[0-9])?$', $str))
|| ($envType == 2 && eregi('(\(|\[|;[[:space:]])(' . $value[0] . ')(;|\]|\))', $str))) {
$expr = $value[0];
if (strpos($expr, '[-_]') === FALSE) {
$expr = str_replace('|', '([-_][[:alpha:]]{2,3})?|', $expr);
}
if (($envType == 1 && eregi('^(' . $expr . ')(;q=[0-9]\\.[0-9])?$', $str))
|| ($envType == 2 && eregi('(\(|\[|;[[:space:]])(' . $expr . ')(;|\]|\))', $str))) {
$lang = $key;
break;
}
@@ -192,8 +197,8 @@ if (!isset($lang)) {
else if (isset($_POST) && !empty($_POST['lang'])) {
$lang = $_POST['lang'];
}
else if (isset($_COOKIE) && !empty($_COOKIE['lang'])) {
$lang = $_COOKIE['lang'];
else if (isset($_COOKIE) && !empty($_COOKIE['pma_lang'])) {
$lang = $_COOKIE['pma_lang'];
}
}

2
main.php
View File

@@ -18,7 +18,7 @@ if (!isset($pma_uri_parts)) {
$cookie_path = substr($pma_uri_parts['path'], 0, strrpos($pma_uri_parts['path'], '/'));
$is_https = (isset($pma_uri_parts['scheme']) && $pma_uri_parts['scheme'] == 'https') ? 1 : 0;
}
setcookie('lang', $lang, time() + 60*60*24*30, $cookie_path, '', $is_https);
setcookie('pma_lang', $lang, time() + 60*60*24*30, $cookie_path, '', $is_https);
// Defines the "item" image depending on text direction
$item_img = './images/dot_violet.png';
// Handles some variables that may have been sent by the calling script