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

MSIE russian problem

Browse Source
This commit is contained in:
Marc Delisle
2003-03-18 11:35:21 +00:00
parent 80d5f1598b
commit f903d0452a
2 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@@ -5,6 +5,11 @@ phpMyAdmin - Changelog
$Id$ $Id$
$Source$ $Source$
2003-03-18 Marc Delisle <lem9@users.sourceforge.net>
* 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 <nijel@users.sourceforge.net> 2003-03-18 Michal Cihar <nijel@users.sourceforge.net>
* libraries/display_tbl.lib.php3: removed &nbsp; from button text, as * libraries/display_tbl.lib.php3: removed &nbsp; from button text, as
Konqueror doesn't like it there and it is not needed. Konqueror doesn't like it there and it is not needed.

5
libraries/select_lang.lib.php3
View File

@@ -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 * When there are more than one charset for a language, we put the -utf-8
* first. * first.
*
* For Russian, we put 1251 first, because MSIE does not accept 866
* and users would not see anything.
*/ */
$available_languages = array( $available_languages = array(
'af-utf-8' => array('af|afrikaans', 'afrikaans-utf-8', 'af'), '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'), '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-utf-8' => array('ro|romanian', 'romanian-utf-8', 'ro'),
'ro-iso-8859-1'=> array('ro|romanian', 'romanian-iso-8859-1', '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-utf-8' => array('ru|russian', 'russian-utf-8', 'ru'),
'ru-dos-866' => array('ru|russian', 'russian-dos-866', 'ru'), 'ru-dos-866' => array('ru|russian', 'russian-dos-866', 'ru'),
'ru-koi8-r' => array('ru|russian', 'russian-koi8-r', '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-utf-8' => array('sk|slovak', 'slovak-utf-8', 'sk'),
'sk-iso-8859-2'=> array('sk|slovak', 'slovak-iso-8859-2', 'sk'), 'sk-iso-8859-2'=> array('sk|slovak', 'slovak-iso-8859-2', 'sk'),
'sk-win1250' => array('sk|slovak', 'slovak-windows-1250', 'sk'), 'sk-win1250' => array('sk|slovak', 'slovak-windows-1250', 'sk'),