From f903d0452a0b0ac72465b8b2b3be06b4db5c3ee0 Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Tue, 18 Mar 2003 11:35:21 +0000 Subject: [PATCH] MSIE russian problem --- ChangeLog | 5 +++++ libraries/select_lang.lib.php3 | 5 ++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 2fe154d22..4d7870893 100755 --- a/ChangeLog +++ b/ChangeLog @@ -5,6 +5,11 @@ phpMyAdmin - Changelog $Id$ $Source$ +2003-03-18 Marc Delisle + * libraries/select_lang.lib.php3: modify order of Russian lang files + because MSIE does not accept cp866 and users do not see anything, + thanks to Volckov Konstantin Michailovich (wolf at sw.ru) + 2003-03-18 Michal Cihar * libraries/display_tbl.lib.php3: removed   from button text, as Konqueror doesn't like it there and it is not needed. diff --git a/libraries/select_lang.lib.php3 b/libraries/select_lang.lib.php3 index d8671ac07..c626405f8 100644 --- a/libraries/select_lang.lib.php3 +++ b/libraries/select_lang.lib.php3 @@ -45,6 +45,9 @@ if (!defined('PMA_SELECT_LANG_LIB_INCLUDED')) { * * When there are more than one charset for a language, we put the -utf-8 * first. + * + * For Russian, we put 1251 first, because MSIE does not accept 866 + * and users would not see anything. */ $available_languages = array( 'af-utf-8' => array('af|afrikaans', 'afrikaans-utf-8', 'af'), @@ -113,10 +116,10 @@ if (!defined('PMA_SELECT_LANG_LIB_INCLUDED')) { '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-dos-866' => array('ru|russian', 'russian-dos-866', 'ru'), 'ru-koi8-r' => array('ru|russian', 'russian-koi8-r', 'ru'), - 'ru-win1251' => array('ru|russian', 'russian-windows-1251', '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'),