projects
/
squirrelmail.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix notice when image is missing
[squirrelmail.git]
/
functions
/
i18n.php
diff --git
a/functions/i18n.php
b/functions/i18n.php
index 4b75de8b61fc31fef5548d28b0eb37e690dee1fd..a56f4f426f07e10ea7ce185a8876b85159178b09 100644
(file)
--- a/
functions/i18n.php
+++ b/
functions/i18n.php
@@
-9,7
+9,7
@@
* Internally the output character set is used. Other characters are
* encoded using Unicode entities according to HTML 4.0.
*
* Internally the output character set is used. Other characters are
* encoded using Unicode entities according to HTML 4.0.
*
- * @copyright © 1999-200
5
The SquirrelMail Project Team
+ * @copyright © 1999-200
6
The SquirrelMail Project Team
* @license http://opensource.org/licenses/gpl-license.php GNU Public License
* @version $Id$
* @package squirrelmail
* @license http://opensource.org/licenses/gpl-license.php GNU Public License
* @version $Id$
* @package squirrelmail
@@
-261,6
+261,13
@@
function fixcharset($charset) {
*/
$charset=preg_replace("/[-:.\/\\\]/",'_',$charset);
*/
$charset=preg_replace("/[-:.\/\\\]/",'_',$charset);
+ // OE ks_c_5601_1987 > cp949
+ $charset=str_replace('ks_c_5601_1987','cp949',$charset);
+ // Moz x-euc-tw > euc-tw
+ $charset=str_replace('x_euc','euc',$charset);
+ // Moz x-windows-949 > cp949
+ $charset=str_replace('x_windows_','cp',$charset);
+
// windows-125x and cp125x charsets
$charset=str_replace('windows_','cp',$charset);
// windows-125x and cp125x charsets
$charset=str_replace('windows_','cp',$charset);
@@
-408,8
+415,13
@@
function set_up_language($sm_language, $do_search = false, $default = false) {
// Many functions expect English conversion rules.
if ($sm_notAlias=='tr_TR') setlocale(LC_CTYPE,'C');
// Many functions expect English conversion rules.
if ($sm_notAlias=='tr_TR') setlocale(LC_CTYPE,'C');
- // Set text direction/alignment variables
- // These don't appear to be used... are they safe to remove?
+ /**
+ * Set text direction/alignment variables
+ * When language environment is setup, scripts can use these globals
+ * without accessing $languages directly and making checks for optional
+ * array key.
+ */
+ global $text_direction, $left_align, $right_align;
if (isset($languages[$sm_notAlias]['DIR']) &&
$languages[$sm_notAlias]['DIR'] == 'rtl') {
/**
if (isset($languages[$sm_notAlias]['DIR']) &&
$languages[$sm_notAlias]['DIR'] == 'rtl') {
/**