* ISO-8859-7 characters from 11/04 (0xB4) to 11/06 (0xB6)
* These are Unicode 900-902
*/
- while (ereg("([\264-\266])", $string, $res)) {
- $replace = '&#' . (ord($res[1])+720) . ';';
- $string = str_replace($res[1], $replace, $string);
- }
-
+ $string = preg_replace("/([\264-\266])/","'&#' . (ord(\\1)+720)",$string);
+
/* 11/07 (0xB7) Middle dot is the same in iso-8859-1 */
$string = str_replace("\267", '·', $string);
* ISO-8859-7 characters from 11/08 (0xB8) to 11/10 (0xBA)
* These are Unicode 900-902
*/
- while (ereg("([\270-\272])", $string, $res)) {
- $replace = '&#' . (ord($res[1])+720) . ";";
- $string = str_replace($res[1], $replace, $string);
- }
+ $string = preg_replace("/([\270-\272])/","'&#' . (ord(\\1)+720)",$string);
/*
* 11/11 (0xBB) Right angle quotation mark is the same as in
$string = str_replace("\273", '»', $string);
/* And now the rest of the charset */
- while (ereg("([\274-\376])", $string, $res)) {
- $replace = '&#' . (ord($res[1])+720) . ';';
- $string = str_replace($res[1], $replace, $string);
- }
+ $string = preg_replace("/([\274-\376])/","'&#' . (ord(\\1)+720)",$string);
return $string;
}
// Euro sign
$string = str_replace ("\244", '€', $string);
// Latin capital letter S with caron
- $string = str_replace ("\244", 'Š', $string);
+ $string = str_replace ("\246", 'Š', $string);
// Latin small letter s with caron
$string = str_replace ("\250", 'š', $string);
// Latin capital letter Z with caron
return (charset_decode_iso_8859_1($string));
}
-/* ISO-8859-15 is Cyrillic */
+/* ISO-8859-5 is Cyrillic */
function charset_decode_iso_8859_5 ($string) {
// Convert to KOI8-R, then return this decoded.
$string = convert_cyr_string($string, 'i', 'k');
if ($do_search && ! $sm_language && isset($HTTP_ACCEPT_LANGUAGE)) {
$sm_language = substr($HTTP_ACCEPT_LANGUAGE, 0, 2);
}
+
if (!$sm_language && isset($squirrelmail_default_language)) {
$squirrelmail_language = $squirrelmail_default_language;
+ $sm_language = $squirrelmail_default_language;
}
$sm_notAlias = $sm_language;
while (isset($languages[$sm_notAlias]['ALIAS'])) {
$sm_notAlias = $languages[$sm_notAlias]['ALIAS'];
}
- if ( isset($sm_language) &&
+ if ( isset($sm_language) &&
$use_gettext &&
$sm_language != '' &&
isset($languages[$sm_notAlias]['CHARSET']) ) {
bindtextdomain( 'squirrelmail', '../locale/' );
- textdomain( 'squirrelmail' );
- if ( !ini_get('safe_mode') &&
+ textdomain( 'squirrelmail' );
+ if ( !ini_get('safe_mode') &&
getenv( 'LC_ALL' ) != $sm_notAlias ) {
putenv( "LC_ALL=$sm_notAlias" );
putenv( "LANG=$sm_notAlias" );
putenv( "LANGUAGE=$sm_notAlias" );
}
- setlocale('LC_ALL', $sm_notAlias);
+ setlocale(LC_ALL, $sm_notAlias);
$squirrelmail_language = $sm_notAlias;
header( 'Content-Type: text/html; charset=' . $languages[$sm_notAlias]['CHARSET'] );
}
* message blindly with the system-wide $default_charset.
*/
global $data_dir, $username, $default_charset, $languages;
-
+
$my_language = getPref($data_dir, $username, 'language');
if (!$my_language) {
return;
$languages['no_NO']['NAME'] = 'Norwegian (Bokmål)';
$languages['no_NO']['CHARSET'] = 'iso-8859-1';
$languages['no']['ALIAS'] = 'no_NO';
-$languages['no_NO_ny']['NAME'] = 'Norwegian (Nynorsk)';
-$languages['no_NO_ny']['CHARSET'] = 'iso-8859-1';
+$languages['nn_NO']['NAME'] = 'Norwegian (Nynorsk)';
+$languages['nn_NO']['CHARSET'] = 'iso-8859-1';
$languages['pl_PL']['NAME'] = 'Polish';
$languages['pl_PL']['CHARSET'] = 'iso-8859-2';
$languages['ru_RU']['CHARSET'] = 'koi8-r';
$languages['ru']['ALIAS'] = 'ru_RU';
-$languages['sr']['NAME'] = 'Serbian';
-$languages['sr']['CHARSET'] = 'iso-8859-2';
-$languages['sr_YU']['ALIAS'] = 'sr';
+$languages['sr_YU']['NAME'] = 'Serbian';
+$languages['sr_YU']['CHARSET'] = 'iso-8859-2';
+$languages['sr']['ALIAS'] = 'sr_YU';
$languages['sv_SE']['NAME'] = 'Swedish';
$languages['sv_SE']['CHARSET'] = 'iso-8859-1';
}
}
-?>
\ No newline at end of file
+?>