Hi list.
I ask you to divide japanese language to two charset encoding files.
lang/japanese-euc.inc.php3 lang/japanese-sjis.inc.php3
I attach these binary files and the patch including last stripslashes problem in common.lib.php3.
diff -rc phpMyAdmin-cvs/libraries/common.lib.php3 phpMyAdmin/libraries/common.lib.php3 *** phpMyAdmin-cvs/libraries/common.lib.php3 Sun Feb 10 19:57:23 2002 --- phpMyAdmin/libraries/common.lib.php3 Tue Feb 19 22:36:11 2002 *************** *** 845,851 **** <table border="<?php echo $GLOBALS['cfgBorder']; ?>" cellpadding="5"> <tr> <td bgcolor="<?php echo $GLOBALS['cfgThBgcolor']; ?>"> ! <b><?php echo stripslashes($message); ?></b><br /> </td> </tr> <?php --- 845,851 ---- <table border="<?php echo $GLOBALS['cfgBorder']; ?>" cellpadding="5"> <tr> <td bgcolor="<?php echo $GLOBALS['cfgThBgcolor']; ?>"> ! <b><?php echo get_magic_quotes_gpc() ? stripslashes($message) : $message; ?></b><br /> </td> </tr> <?php diff -rc phpMyAdmin-cvs/libraries/select_lang.lib.php3 phpMyAdmin/libraries/select_lang.lib.php3 *** phpMyAdmin-cvs/libraries/select_lang.lib.php3 Mon Feb 18 22:43:45 2002 --- phpMyAdmin/libraries/select_lang.lib.php3 Tue Feb 19 22:09:59 2002 *************** *** 58,64 **** 'he' => array('he|hebrew', 'hebrew', 'he'), 'hu' => array('hu|hungarian', 'hungarian', 'hu'), 'it' => array('it|italian', 'italian', 'it'), ! 'ja' => array('ja|japanese', 'japanese', 'ja'), 'ko' => array('ko|korean', 'korean', 'ko'), 'nl' => array('nl([-_][[:alpha:]]{2})?|dutch', 'dutch', 'nl'), 'no' => array('no|norwegian', 'norwegian', 'no'), --- 58,65 ---- 'he' => array('he|hebrew', 'hebrew', 'he'), 'hu' => array('hu|hungarian', 'hungarian', 'hu'), 'it' => array('it|italian', 'italian', 'it'), ! 'ja' => array('ja|japanese-euc', 'japanese-euc', 'ja'), ! 'ja-sjis' => array('ja|japanese-sjis', 'japanese-sjis', 'ja'), 'ko' => array('ko|korean', 'korean', 'ko'), 'nl' => array('nl([-_][[:alpha:]]{2})?|dutch', 'dutch', 'nl'), 'no' => array('no|norwegian', 'norwegian', 'no'),
Luc,
ok I am merging this.
luc a écrit :
Hi list.
I ask you to divide japanese language to two charset encoding files.
lang/japanese-euc.inc.php3 lang/japanese-sjis.inc.php3
I attach these binary files and the patch including last stripslashes problem in common.lib.php3.
diff -rc phpMyAdmin-cvs/libraries/common.lib.php3 phpMyAdmin/libraries/common.lib.php3 *** phpMyAdmin-cvs/libraries/common.lib.php3 Sun Feb 10 19:57:23 2002 --- phpMyAdmin/libraries/common.lib.php3 Tue Feb 19 22:36:11 2002
*** 845,851 **** <table border="<?php echo $GLOBALS['cfgBorder']; ?>" cellpadding="5"> <tr> <td bgcolor="<?php echo $GLOBALS['cfgThBgcolor']; ?>"> ! <b><?php echo stripslashes($message); ?></b><br /> </td> </tr> <?php --- 845,851 ---- <table border="<?php echo $GLOBALS['cfgBorder']; ?>" cellpadding="5"> <tr> <td bgcolor="<?php echo $GLOBALS['cfgThBgcolor']; ?>"> ! <b><?php echo get_magic_quotes_gpc() ? stripslashes($message) : $message; ?></b><br /> </td> </tr> <?php diff -rc phpMyAdmin-cvs/libraries/select_lang.lib.php3 phpMyAdmin/libraries/select_lang.lib.php3 *** phpMyAdmin-cvs/libraries/select_lang.lib.php3 Mon Feb 18 22:43:45 2002 --- phpMyAdmin/libraries/select_lang.lib.php3 Tue Feb 19 22:09:59 2002
*** 58,64 **** 'he' => array('he|hebrew', 'hebrew', 'he'), 'hu' => array('hu|hungarian', 'hungarian', 'hu'), 'it' => array('it|italian', 'italian', 'it'), ! 'ja' => array('ja|japanese', 'japanese', 'ja'), 'ko' => array('ko|korean', 'korean', 'ko'), 'nl' => array('nl([-_][[:alpha:]]{2})?|dutch', 'dutch', 'nl'), 'no' => array('no|norwegian', 'norwegian', 'no'), --- 58,65 ---- 'he' => array('he|hebrew', 'hebrew', 'he'), 'hu' => array('hu|hungarian', 'hungarian', 'hu'), 'it' => array('it|italian', 'italian', 'it'), ! 'ja' => array('ja|japanese-euc', 'japanese-euc', 'ja'), ! 'ja-sjis' => array('ja|japanese-sjis', 'japanese-sjis', 'ja'), 'ko' => array('ko|korean', 'korean', 'ko'), 'nl' => array('nl([-_][[:alpha:]]{2})?|dutch', 'dutch', 'nl'), 'no' => array('no|norwegian', 'norwegian', 'no'),
Name: japanese.inc.tgz
japanese.inc.tgz Type: PowerArchiver GZIP File (application/x-compressed) Encoding: base64
Merged.
Marc
Marc Delisle a écrit :
Luc,
ok I am merging this.
luc a écrit :
Hi list.
I ask you to divide japanese language to two charset encoding files.
lang/japanese-euc.inc.php3 lang/japanese-sjis.inc.php3
I attach these binary files and the patch including last stripslashes problem in common.lib.php3.