aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorrvelices <rv-github@modusoptimus.com>2007-10-08 23:13:56 +0000
committerrvelices <rv-github@modusoptimus.com>2007-10-08 23:13:56 +0000
commita15cc194b98bf25dc67a9009b0ee2c0f63671642 (patch)
treee78cb90a11a78d191499eb01d1d9b61e63be9d47
parentd446a221cde74616db3715f665b0ee7210cb133c (diff)
merge revisions 2121, 2122 and 2123 from trunk to branch-1_7
- function str2url is compatible with utf-8 - removed some old code (useless) - remove str_translate_to_ascii7bits and lang_table_translate_ascii7bits - mail subject and address names can contain accentuated characters git-svn-id: http://piwigo.org/svn/branches/branch-1_7@2125 68402e56-0260-453c-a942-63ccdbb3a9ee
Diffstat
-rw-r--r--include/category_default.inc.php9
-rw-r--r--include/functions.inc.php241
-rw-r--r--include/functions_mail.inc.php70
-rw-r--r--language/en_UK.iso-8859-1/common.lang.php258
-rw-r--r--language/fr_FR.iso-8859-1/common.lang.php258
5 files changed, 207 insertions, 629 deletions
diff --git a/include/category_default.inc.php b/include/category_default.inc.php
index fd6bd9684..a1654e396 100644
--- a/include/category_default.inc.php
+++ b/include/category_default.inc.php
@@ -105,7 +105,7 @@ foreach ($pictures as $row)
'CLASS'=> set_span_class($row['hit']) . ' nb-hits',
)
);
-
+
}
if ($conf['show_thumbnail_caption'])
@@ -134,11 +134,6 @@ foreach ($pictures as $row)
}
break;
}
- case 'search' :
- {
- $name = replace_search($name, $page['search']);
- break;
- }
}
$template->assign_block_vars(
@@ -161,7 +156,7 @@ SELECT COUNT(*) AS nb_comments
$template->assign_block_vars(
'thumbnails.line.thumbnail.nb_comments',
array(
- 'NB_COMMENTS'=> l10n_dec('%d comment', '%d comments',
+ 'NB_COMMENTS'=> l10n_dec('%d comment', '%d comments',
$row['nb_comments']),
'CLASS'=> set_span_class($row['nb_comments']) . ' nb-comments',
)
diff --git a/include/functions.inc.php b/include/functions.inc.php
index aee815866..5f448cdd1 100644
--- a/include/functions.inc.php
+++ b/include/functions.inc.php
@@ -298,27 +298,169 @@ function get_picture_size( $original_width, $original_height,
return $picture_size;
}
+/* Returns true if the string appears to be encoded in UTF-8. (from wordpress)
+ * @param string Str
+ */
+function seems_utf8($Str) { # by bmorel at ssi dot fr
+ for ($i=0; $i<strlen($Str); $i++) {
+ if (ord($Str[$i]) < 0x80) continue; # 0bbbbbbb
+ elseif ((ord($Str[$i]) & 0xE0) == 0xC0) $n=1; # 110bbbbb
+ elseif ((ord($Str[$i]) & 0xF0) == 0xE0) $n=2; # 1110bbbb
+ elseif ((ord($Str[$i]) & 0xF8) == 0xF0) $n=3; # 11110bbb
+ elseif ((ord($Str[$i]) & 0xFC) == 0xF8) $n=4; # 111110bb
+ elseif ((ord($Str[$i]) & 0xFE) == 0xFC) $n=5; # 1111110b
+ else return false; # Does not match any model
+ for ($j=0; $j<$n; $j++) { # n bytes matching 10bbbbbb follow ?
+ if ((++$i == strlen($Str)) || ((ord($Str[$i]) & 0xC0) != 0x80))
+ return false;
+ }
+ }
+ return true;
+}
+
+/* Remove accents from a UTF-8 or ISO-859-1 string (from wordpress)
+ * @param string sstring - an UTF-8 or ISO-8859-1 string
+ */
+function remove_accents($string)
+{
+ if ( !preg_match('/[\x80-\xff]/', $string) )
+ return $string;
+
+ if (seems_utf8($string)) {
+ $chars = array(
+ // Decompositions for Latin-1 Supplement
+ chr(195).chr(128) => 'A', chr(195).chr(129) => 'A',
+ chr(195).chr(130) => 'A', chr(195).chr(131) => 'A',
+ chr(195).chr(132) => 'A', chr(195).chr(133) => 'A',
+ chr(195).chr(135) => 'C', chr(195).chr(136) => 'E',
+ chr(195).chr(137) => 'E', chr(195).chr(138) => 'E',
+ chr(195).chr(139) => 'E', chr(195).chr(140) => 'I',
+ chr(195).chr(141) => 'I', chr(195).chr(142) => 'I',
+ chr(195).chr(143) => 'I', chr(195).chr(145) => 'N',
+ chr(195).chr(146) => 'O', chr(195).chr(147) => 'O',
+ chr(195).chr(148) => 'O', chr(195).chr(149) => 'O',
+ chr(195).chr(150) => 'O', chr(195).chr(153) => 'U',
+ chr(195).chr(154) => 'U', chr(195).chr(155) => 'U',
+ chr(195).chr(156) => 'U', chr(195).chr(157) => 'Y',
+ chr(195).chr(159) => 's', chr(195).chr(160) => 'a',
+ chr(195).chr(161) => 'a', chr(195).chr(162) => 'a',
+ chr(195).chr(163) => 'a', chr(195).chr(164) => 'a',
+ chr(195).chr(165) => 'a', chr(195).chr(167) => 'c',
+ chr(195).chr(168) => 'e', chr(195).chr(169) => 'e',
+ chr(195).chr(170) => 'e', chr(195).chr(171) => 'e',
+ chr(195).chr(172) => 'i', chr(195).chr(173) => 'i',
+ chr(195).chr(174) => 'i', chr(195).chr(175) => 'i',
+ chr(195).chr(177) => 'n', chr(195).chr(178) => 'o',
+ chr(195).chr(179) => 'o', chr(195).chr(180) => 'o',
+ chr(195).chr(181) => 'o', chr(195).chr(182) => 'o',
+ chr(195).chr(182) => 'o', chr(195).chr(185) => 'u',
+ chr(195).chr(186) => 'u', chr(195).chr(187) => 'u',
+ chr(195).chr(188) => 'u', chr(195).chr(189) => 'y',
+ chr(195).chr(191) => 'y',
+ // Decompositions for Latin Extended-A
+ chr(196).chr(128) => 'A', chr(196).chr(129) => 'a',
+ chr(196).chr(130) => 'A', chr(196).chr(131) => 'a',
+ chr(196).chr(132) => 'A', chr(196).chr(133) => 'a',
+ chr(196).chr(134) => 'C', chr(196).chr(135) => 'c',
+ chr(196).chr(136) => 'C', chr(196).chr(137) => 'c',
+ chr(196).chr(138) => 'C', chr(196).chr(139) => 'c',
+ chr(196).chr(140) => 'C', chr(196).chr(141) => 'c',
+ chr(196).chr(142) => 'D', chr(196).chr(143) => 'd',
+ chr(196).chr(144) => 'D', chr(196).chr(145) => 'd',
+ chr(196).chr(146) => 'E', chr(196).chr(147) => 'e',
+ chr(196).chr(148) => 'E', chr(196).chr(149) => 'e',
+ chr(196).chr(150) => 'E', chr(196).chr(151) => 'e',
+ chr(196).chr(152) => 'E', chr(196).chr(153) => 'e',
+ chr(196).chr(154) => 'E', chr(196).chr(155) => 'e',
+ chr(196).chr(156) => 'G', chr(196).chr(157) => 'g',
+ chr(196).chr(158) => 'G', chr(196).chr(159) => 'g',
+ chr(196).chr(160) => 'G', chr(196).chr(161) => 'g',
+ chr(196).chr(162) => 'G', chr(196).chr(163) => 'g',
+ chr(196).chr(164) => 'H', chr(196).chr(165) => 'h',
+ chr(196).chr(166) => 'H', chr(196).chr(167) => 'h',
+ chr(196).chr(168) => 'I', chr(196).chr(169) => 'i',
+ chr(196).chr(170) => 'I', chr(196).chr(171) => 'i',
+ chr(196).chr(172) => 'I', chr(196).chr(173) => 'i',
+ chr(196).chr(174) => 'I', chr(196).chr(175) => 'i',
+ chr(196).chr(176) => 'I', chr(196).chr(177) => 'i',
+ chr(196).chr(178) => 'IJ',chr(196).chr(179) => 'ij',
+ chr(196).chr(180) => 'J', chr(196).chr(181) => 'j',
+ chr(196).chr(182) => 'K', chr(196).chr(183) => 'k',
+ chr(196).chr(184) => 'k', chr(196).chr(185) => 'L',
+ chr(196).chr(186) => 'l', chr(196).chr(187) => 'L',
+ chr(196).chr(188) => 'l', chr(196).chr(189) => 'L',
+ chr(196).chr(190) => 'l', chr(196).chr(191) => 'L',
+ chr(197).chr(128) => 'l', chr(197).chr(129) => 'L',
+ chr(197).chr(130) => 'l', chr(197).chr(131) => 'N',
+ chr(197).chr(132) => 'n', chr(197).chr(133) => 'N',
+ chr(197).chr(134) => 'n', chr(197).chr(135) => 'N',
+ chr(197).chr(136) => 'n', chr(197).chr(137) => 'N',
+ chr(197).chr(138) => 'n', chr(197).chr(139) => 'N',
+ chr(197).chr(140) => 'O', chr(197).chr(141) => 'o',
+ chr(197).chr(142) => 'O', chr(197).chr(143) => 'o',
+ chr(197).chr(144) => 'O', chr(197).chr(145) => 'o',
+ chr(197).chr(146) => 'OE',chr(197).chr(147) => 'oe',
+ chr(197).chr(148) => 'R',chr(197).chr(149) => 'r',
+ chr(197).chr(150) => 'R',chr(197).chr(151) => 'r',
+ chr(197).chr(152) => 'R',chr(197).chr(153) => 'r',
+ chr(197).chr(154) => 'S',chr(197).chr(155) => 's',
+ chr(197).chr(156) => 'S',chr(197).chr(157) => 's',
+ chr(197).chr(158) => 'S',chr(197).chr(159) => 's',
+ chr(197).chr(160) => 'S', chr(197).chr(161) => 's',
+ chr(197).chr(162) => 'T', chr(197).chr(163) => 't',
+ chr(197).chr(164) => 'T', chr(197).chr(165) => 't',
+ chr(197).chr(166) => 'T', chr(197).chr(167) => 't',
+ chr(197).chr(168) => 'U', chr(197).chr(169) => 'u',
+ chr(197).chr(170) => 'U', chr(197).chr(171) => 'u',
+ chr(197).chr(172) => 'U', chr(197).chr(173) => 'u',
+ chr(197).chr(174) => 'U', chr(197).chr(175) => 'u',
+ chr(197).chr(176) => 'U', chr(197).chr(177) => 'u',
+ chr(197).chr(178) => 'U', chr(197).chr(179) => 'u',
+ chr(197).chr(180) => 'W', chr(197).chr(181) => 'w',
+ chr(197).chr(182) => 'Y', chr(197).chr(183) => 'y',
+ chr(197).chr(184) => 'Y', chr(197).chr(185) => 'Z',
+ chr(197).chr(186) => 'z', chr(197).chr(187) => 'Z',
+ chr(197).chr(188) => 'z', chr(197).chr(189) => 'Z',
+ chr(197).chr(190) => 'z', chr(197).chr(191) => 's',
+ // Euro Sign
+ chr(226).chr(130).chr(172) => 'E',
+ // GBP (Pound) Sign
+ chr(194).chr(163) => '');
+
+ $string = strtr($string, $chars);
+ } else {
+ // Assume ISO-8859-1 if not UTF-8
+ $chars['in'] = chr(128).chr(131).chr(138).chr(142).chr(154).chr(158)
+ .chr(159).chr(162).chr(165).chr(181).chr(192).chr(193).chr(194)
+ .chr(195).chr(196).chr(197).chr(199).chr(200).chr(201).chr(202)
+ .chr(203).chr(204).chr(205).chr(206).chr(207).chr(209).chr(210)
+ .chr(211).chr(212).chr(213).chr(214).chr(216).chr(217).chr(218)
+ .chr(219).chr(220).chr(221).chr(224).chr(225).chr(226).chr(227)
+ .chr(228).chr(229).chr(231).chr(232).chr(233).chr(234).chr(235)
+ .chr(236).chr(237).chr(238).chr(239).chr(241).chr(242).chr(243)
+ .chr(244).chr(245).chr(246).chr(248).chr(249).chr(250).chr(251)
+ .chr(252).chr(253).chr(255);
+
+ $chars['out'] = "EfSZszYcYuAAAAAACEEEEIIIINOOOOOOUUUUYaaaaaaceeeeiiiinoooooouuuuyy";
+
+ $string = strtr($string, $chars['in'], $chars['out']);
+ $double_chars['in'] = array(chr(140), chr(156), chr(198), chr(208), chr(222), chr(223), chr(230), chr(240), chr(254));
+ $double_chars['out'] = array('OE', 'oe', 'AE', 'DH', 'TH', 'ss', 'ae', 'dh', 'th');
+ $string = str_replace($double_chars['in'], $double_chars['out'], $string);
+ }
+
+ return $string;
+}
+
/**
* simplify a string to insert it into an URL
*
- * based on str2url function from Dotclear
- *
* @param string
* @return string
*/
function str2url($str)
{
- $str = strtr(
- $str,
- 'ÀÁÂÃÄÅàáâãäåÇçÒÓÔÕÖØòóôõöøÈÉÊËèéêëÌÍÎÏìíîïÙÚÛÜùúûü¾ÝÿýÑñ',
- 'AAAAAAaaaaaaCcOOOOOOooooooEEEEeeeeIIIIiiiiUUUUuuuuYYyyNn'
- );
-
- $str = str_replace('Æ', 'AE', $str);
- $str = str_replace('æ', 'ae', $str);
- $str = str_replace('¼', 'OE', $str);
- $str = str_replace('½', 'oe', $str);
-
+ $str = remove_accents($str);
$str = preg_replace('/[^a-z0-9_\s\'\:\/\[\],-]/','',strtolower($str));
$str = preg_replace('/[\s\'\:\/\[\],-]+/',' ',trim($str));
$res = str_replace(' ','_',$str);
@@ -354,61 +496,6 @@ function get_languages()
return $languages;
}
-/**
- * replaces the $search into <span style="$style">$search</span> in the
- * given $string.
- *
- * case insensitive replacements, does not replace characters in HTML tags
- *
- * @param string $string
- * @param string $search
- * @param string $style
- * @return string
- */
-function add_style( $string, $search, $style )
-{
- //return $string;
- $return_string = '';
- $remaining = $string;
-
- $start = 0;
- $end = 0;
- $start = strpos ( $remaining, '<' );
- $end = strpos ( $remaining, '>' );
- while ( is_numeric( $start ) and is_numeric( $end ) )
- {
- $treatment = substr ( $remaining, 0, $start );
- $treatment = preg_replace( '/('.$search.')/i',
- '<span style="'.$style.'">\\0</span>',
- $treatment );
- $return_string.= $treatment.substr( $remaining, $start, $end-$start+1 );
- $remaining = substr ( $remaining, $end + 1, strlen( $remaining ) );
- $start = strpos ( $remaining, '<' );
- $end = strpos ( $remaining, '>' );
- }
- $treatment = preg_replace( '/('.$search.')/i',
- '<span style="'.$style.'">\\0</span>',
- $remaining );
- $return_string.= $treatment;
-
- return $return_string;
-}
-
-// replace_search replaces a searched words array string by the search in
-// another style for the given $string.
-function replace_search( $string, $search )
-{
- // FIXME : with new advanced search, this function needs a rewrite
- return $string;
-
- $words = explode( ',', $search );
- $style = 'background-color:white;color:red;';
- foreach ( $words as $word ) {
- $string = add_style( $string, $word, $style );
- }
- return $string;
-}
-
function pwg_log($image_id = null, $image_type = null)
{
global $conf, $user, $page;
@@ -1113,24 +1200,6 @@ function l10n_args($key_args, $sep = "\n")
}
/**
- * Translate string in string ascii7bits
- * It's possible to do that with iconv_substr
- * but this fonction is not avaible on all the providers.
- *
- * @param string str
- * @return string
- */
-function str_translate_to_ascii7bits($str)
-{
- global $lang_table_translate_ascii7bits;
-
- $src_table = array_keys($lang_table_translate_ascii7bits);
- $dst_table = array_values($lang_table_translate_ascii7bits);
-
- return str_replace($src_table , $dst_table, $str);
-}
-
-/**
* returns the corresponding value from $themeconf if existing. Else, the
* key is returned
*
diff --git a/include/functions_mail.inc.php b/include/functions_mail.inc.php
index ee7b2dc7e..a20a32797 100644
--- a/include/functions_mail.inc.php
+++ b/include/functions_mail.inc.php
@@ -28,6 +28,29 @@
// | functions |
// +-----------------------------------------------------------------------+
+
+/**
+ * Encodes a string using Q form if required (RFC2045)
+ * mail headers MUST contain only US-ASCII characters
+ */
+function encode_mime_header($str)
+{
+ $x = preg_match_all('/[\000-\010\013\014\016-\037\177-\377]/', $str, $matches);
+ if ($x==0)
+ {
+ return $str;
+ }
+ // Replace every high ascii, control =, ? and _ characters
+ $str = preg_replace('/([\000-\011\013\014\016-\037\075\077\137\177-\377])/e',
+ "'='.sprintf('%02X', ord('\\1'))", $str);
+
+ // Replace every spaces to _ (more readable than =20)
+ $str = str_replace(" ", "_", $str);
+
+ global $lang_info;
+ return '=?'.$lang_info['charset'].'?Q?'.$str.'?=';
+}
+
/*
* Returns an array of mail configuration parameters :
*
@@ -80,12 +103,19 @@ function format_email($name, $email)
// Spring cleaning
$cvt_name = trim(preg_replace('#[\n\r]+#s', '', $name));
$cvt_email = trim(preg_replace('#[\n\r]+#s', '', $email));
- // Ascii convertion
- $cvt_name = '"'.addslashes(str_translate_to_ascii7bits($cvt_name)).'"';
+
+ if ($cvt_name!="")
+ {
+ $cvt_name = encode_mime_header(
+ '"'
+ .addcslashes($cvt_name,'"')
+ .'"');
+ $cvt_name .= ' ';
+ }
if (strpos($cvt_email, '<') === false)
{
- return $cvt_name.' <'.$cvt_email.'>';
+ return $cvt_name.'<'.$cvt_email.'>';
}
else
{
@@ -112,7 +142,7 @@ function get_array_template_theme($args = array())
global $conf;
$res = array();
-
+
if (empty($args['template']) or empty($args['theme']))
{
list($res['template'], $res['theme']) = explode('/', get_default_template());
@@ -151,7 +181,7 @@ function get_mail_template($email_format, $args = array())
}
/**
- * Return string email format (html or not)
+ * Return string email format (html or not)
*
* @param string format
*/
@@ -160,7 +190,7 @@ function get_str_email_format($is_html)
return ($is_html ? 'text/html' : 'text/plain');
}
-/*
+/*
* Switch language to param language
* All entries are push on language stack
*
@@ -214,7 +244,7 @@ function switch_lang_to($language)
}
}
-/*
+/*
* Switch back language pushed with switch_lang_to function
*
* @param: none
@@ -251,7 +281,7 @@ function switch_lang_back()
*/
/*
* send en notification email to all administrators
- * if a administrator is doing action,
+ * if a administrator is doing action,
* he's be removed to email list
*
* @param:
@@ -314,7 +344,7 @@ order by
(
'Bcc' => $admins,
'subject' => '['.$conf['gallery_title'].'] '.l10n_args($keyargs_subject),
- 'content' =>
+ 'content' =>
l10n_args($keyargs_content)."\n\n"
.l10n_args($keyargs_content_admin_info)."\n",
'content_format' => 'text/plain'
@@ -342,7 +372,7 @@ order by
* @return boolean (Ok or not)
*/
function pwg_mail_group(
- $group_id, $email_format, $keyargs_subject,
+ $group_id, $email_format, $keyargs_subject,
$dirname, $tpl_shortname,
$assign_vars = array(), $language_selected = '')
{
@@ -352,11 +382,11 @@ function pwg_mail_group(
$query = '
SELECT
distinct language, template
-FROM
- '.USER_GROUP_TABLE.' as ug
+FROM
+ '.USER_GROUP_TABLE.' as ug
INNER JOIN '.USERS_TABLE.' as u ON '.$conf['user_fields']['id'].' = ug.user_id
INNER JOIN '.USER_INFOS_TABLE.' as ui ON ui.user_id = ug.user_id
-WHERE
+WHERE
'.$conf['user_fields']['email'].' IS NOT NULL
AND group_id = '.$group_id;
@@ -388,11 +418,11 @@ WHERE
SELECT
u.'.$conf['user_fields']['username'].' as username,
u.'.$conf['user_fields']['email'].' as mail_address
-FROM
- '.USER_GROUP_TABLE.' as ug
+FROM
+ '.USER_GROUP_TABLE.' as ug
INNER JOIN '.USERS_TABLE.' as u ON '.$conf['user_fields']['id'].' = ug.user_id
INNER JOIN '.USER_INFOS_TABLE.' as ui ON ui.user_id = ug.user_id
-WHERE
+WHERE
'.$conf['user_fields']['email'].' IS NOT NULL
AND group_id = '.$group_id.'
AND language = \''.$elem['language'].'\'
@@ -417,7 +447,7 @@ WHERE
switch_lang_to($elem['language']);
$mail_template = get_mail_template($email_format, $elem);
- $mail_template->set_filename($tpl_shortname,
+ $mail_template->set_filename($tpl_shortname,
(empty($dirname) ? '' : $dirname.'/').$tpl_shortname.'.tpl');
$mail_template->assign_vars($assign_vars);
@@ -470,7 +500,7 @@ function pwg_mail($to, $args = array())
{
return true;
}
-
+
if (!isset($conf_mail))
{
$conf_mail = get_mail_configuration();
@@ -508,7 +538,7 @@ function pwg_mail($to, $args = array())
// Spring cleaning
$cvt_subject = trim(preg_replace('#[\n\r]+#s', '', $args['subject']));
// Ascii convertion
- $cvt_subject = str_translate_to_ascii7bits($cvt_subject);
+ $cvt_subject = encode_mime_header($cvt_subject);
if (!isset($args['content']))
{
@@ -576,7 +606,7 @@ function pwg_mail($to, $args = array())
'CONTENT_ENCODING' => $lang_info['charset'],
'LANG' => $lang_info['code'],
'DIR' => $lang_info['direction'],
-
+
// Footer
'GALLERY_URL' =>
isset($page['gallery_url']) ?
diff --git a/language/en_UK.iso-8859-1/common.lang.php b/language/en_UK.iso-8859-1/common.lang.php
index a27b3cf78..8aaac60ef 100644
--- a/language/en_UK.iso-8859-1/common.lang.php
+++ b/language/en_UK.iso-8859-1/common.lang.php
@@ -31,264 +31,6 @@ $lang_info['charset'] = 'iso-8859-1';
$lang_info['direction'] = 'ltr';
$lang_info['code'] = 'en';
$lang_info['zero_plural'] = true;
-$lang_table_translate_ascii7bits = array(
- chr( 0) => chr(0),
- chr( 1) => chr( 1),
- chr( 2) => chr( 2),
- chr( 3) => chr( 3),
- chr( 4) => chr( 4),
- chr( 5) => chr( 5),
- chr( 6) => chr( 6),
- chr( 7) => chr( 7),
- chr( 8) => chr( 8),
- chr( 9) => chr( 9),
- chr( 10) => chr( 10),
- chr( 11) => chr( 11),
- chr( 12) => chr( 12),
- chr( 13) => chr( 13),
- chr( 14) => chr( 14),
- chr( 15) => chr( 15),
- chr( 16) => chr( 16),
- chr( 17) => chr( 17),
- chr( 18) => chr( 18),
- chr( 19) => chr( 19),
- chr( 20) => chr( 20),
- chr( 21) => chr( 21),
- chr( 22) => chr( 22),
- chr( 23) => chr( 23),
- chr( 24) => chr( 24),
- chr( 25) => chr( 25),
- chr( 26) => chr( 26),
- chr( 27) => chr( 27),
- chr( 28) => chr( 28),
- chr( 29) => chr( 29),
- chr( 30) => chr( 30),
- chr( 31) => chr( 31),
- chr( 32) => chr( 32),
- chr( 33) => chr( 33),
- chr( 34) => chr( 34),
- chr( 35) => chr( 35),
- chr( 36) => chr( 36),
- chr( 37) => chr( 37),
- chr( 38) => chr( 38),
- chr( 39) => chr( 39),
- chr( 40) => chr( 40),
- chr( 41) => chr( 41),
- chr( 42) => chr( 42),
- chr( 43) => chr( 43),
- chr( 44) => chr( 44),
- chr( 45) => chr( 45),
- chr( 46) => chr( 46),
- chr( 47) => chr( 47),
- chr( 48) => chr( 48),
- chr( 49) => chr( 49),
- chr( 50) => chr( 50),
- chr( 51) => chr( 51),
- chr( 52) => chr( 52),
- chr( 53) => chr( 53),
- chr( 54) => chr( 54),
- chr( 55) => chr( 55),
- chr( 56) => chr( 56),
- chr( 57) => chr( 57),
- chr( 58) => chr( 58),
- chr( 59) => chr( 59),
- chr( 60) => chr( 60),
- chr( 61) => chr( 61),
- chr( 62) => chr( 62),
- chr( 63) => chr( 63),
- chr( 64) => chr( 64),
- chr( 65) => chr( 65),
- chr( 66) => chr( 66),
- chr( 67) => chr( 67),
- chr( 68) => chr( 68),
- chr( 69) => chr( 69),
- chr( 70) => chr( 70),
- chr( 71) => chr( 71),
- chr( 72) => chr( 72),
- chr( 73) => chr( 73),
- chr( 74) => chr( 74),
- chr( 75) => chr( 75),
- chr( 76) => chr( 76),
- chr( 77) => chr( 77),
- chr( 78) => chr( 78),
- chr( 79) => chr( 79),
- chr( 80) => chr( 80),
- chr( 81) => chr( 81),
- chr( 82) => chr( 82),
- chr( 83) => chr( 83),
- chr( 84) => chr( 84),
- chr( 85) => chr( 85),
- chr( 86) => chr( 86),
- chr( 87) => chr( 87),
- chr( 88) => chr( 88),
- chr( 89) => chr( 89),
- chr( 90) => chr( 90),
- chr( 91) => chr( 91),
- chr( 92) => chr( 92),
- chr( 93) => chr( 93),
- chr( 94) => chr( 94),
- chr( 95) => chr( 95),
- chr( 96) => chr( 96),
- chr( 97) => chr( 97),
- chr( 98) => chr( 98),
- chr( 99) => chr( 99),
- chr(100) => chr(100),
- chr(101) => chr(101),
- chr(102) => chr(102),
- chr(103) => chr(103),
- chr(104) => chr(104),
- chr(105) => chr(105),
- chr(106) => chr(106),
- chr(107) => chr(107),
- chr(108) => chr(108),
- chr(109) => chr(109),
- chr(110) => chr(110),
- chr(111) => chr(111),
- chr(112) => chr(112),
- chr(113) => chr(113),
- chr(114) => chr(114),
- chr(115) => chr(115),
- chr(116) => chr(116),
- chr(117) => chr(117),
- chr(118) => chr(118),
- chr(119) => chr(119),
- chr(120) => chr(120),
- chr(121) => chr(121),
- chr(122) => chr(122),
- chr(123) => chr(123),
- chr(124) => chr(124),
- chr(125) => chr(125),
- chr(126) => chr(126),
- chr(127) => chr(127),
- chr(128) => chr(128),
- chr(129) => chr( 95),
- chr(130) => chr( 44),
- chr(131) => chr(102),
- chr(132) => chr( 44),
- chr(133) => chr( 46),
- chr(134) => chr( 43),
- chr(135) => chr( 43),
- chr(136) => chr( 32),
- chr(137) => chr( 37),
- chr(138) => chr( 83),
- chr(139) => chr( 60),
- chr(140) => chr( 69),
- chr(141) => chr( 32),
- chr(142) => chr( 90),
- chr(143) => chr( 32),
- chr(144) => chr( 32),
- chr(145) => chr( 39),
- chr(146) => chr( 39),
- chr(147) => chr( 34),
- chr(148) => chr( 34),
- chr(149) => chr( 46),
- chr(150) => chr( 45),
- chr(151) => chr( 45),
- chr(152) => chr( 32),
- chr(153) => chr( 32),
- chr(154) => chr(115),
- chr(155) => chr( 62),
- chr(156) => chr(111),
- chr(157) => chr( 32),
- chr(158) => chr(122),
- chr(159) => chr( 89),
- chr(160) => chr( 32),
- chr(161) => chr( 33),
- chr(162) => chr( 99),
- chr(163) => chr( 76),
- chr(164) => chr( 32),
- chr(165) => chr( 86),
- chr(166) => chr(124),
- chr(167) => chr( 83),
- chr(168) => chr( 32),
- chr(169) => chr( 99),
- chr(170) => chr( 97),
- chr(171) => chr( 60),
- chr(172) => chr( 32),
- chr(173) => chr( 45),
- chr(174) => chr( 114),
- chr(175) => chr( 45),
- chr(176) => chr( 111),
- chr(177) => chr( 43),
- chr(178) => chr( 50),
- chr(179) => chr( 51),
- chr(180) => chr( 39),
- chr(181) => chr(117),
- chr(182) => chr( 32),
- chr(183) => chr( 46),
- chr(184) => chr( 97),
- chr(185) => chr( 49),
- chr(186) => chr(111),
- chr(187) => chr( 62),
- chr(188) => chr( 32),
- chr(189) => chr( 32),
- chr(190) => chr( 32),
- chr(191) => chr( 63),
- chr(192) => chr( 65),
- chr(193) => chr( 65),
- chr(194) => chr( 65),
- chr(195) => chr( 65),
- chr(196) => chr( 65),
- chr(197) => chr( 65),
- chr(198) => chr( 65),
- chr(199) => chr( 67),
- chr(200) => chr( 69),
- chr(201) => chr( 69),
- chr(202) => chr( 69),
- chr(203) => chr( 69),
- chr(204) => chr( 73),
- chr(205) => chr( 73),
- chr(206) => chr( 73),
- chr(207) => chr( 73),
- chr(208) => chr( 68),
- chr(209) => chr( 78),
- chr(210) => chr( 79),
- chr(211) => chr( 79),
- chr(212) => chr( 79),
- chr(213) => chr( 79),
- chr(214) => chr( 79),
- chr(215) => chr( 42),
- chr(216) => chr( 48),
- chr(217) => chr( 85),
- chr(218) => chr( 85),
- chr(219) => chr( 85),
- chr(220) => chr( 85),
- chr(221) => chr( 89),
- chr(222) => chr( 80),
- chr(223) => chr( 66),
- chr(224) => chr( 97),
- chr(225) => chr( 97),
- chr(226) => chr( 97),
- chr(227) => chr( 97),
- chr(228) => chr( 97),
- chr(229) => chr( 97),
- chr(230) => chr( 97),
- chr(231) => chr( 99),
- chr(232) => chr(101),
- chr(233) => chr(101),
- chr(234) => chr(101),
- chr(235) => chr(101),
- chr(236) => chr(105),
- chr(237) => chr(105),
- chr(238) => chr(105),
- chr(239) => chr(105),
- chr(240) => chr( 97),
- chr(241) => chr(110),
- chr(242) => chr(111),
- chr(243) => chr(111),
- chr(244) => chr(111),
- chr(245) => chr(111),
- chr(246) => chr(111),
- chr(247) => chr( 47),
- chr(248) => chr( 48),
- chr(249) => chr(117),
- chr(250) => chr(117),
- chr(251) => chr(117),
- chr(252) => chr(117),
- chr(253) => chr(117),
- chr(254) => chr( 98),
- chr(255) => chr(121)
-);
$lang['%.2f (rated %d times, standard deviation = %.2f)'] = '%.2f (rated %d times, standard deviation = %.2f)';
$lang['%d Kb'] = '%d Kb';
diff --git a/language/fr_FR.iso-8859-1/common.lang.php b/language/fr_FR.iso-8859-1/common.lang.php
index 933f03f0f..2e7db36cd 100644
--- a/language/fr_FR.iso-8859-1/common.lang.php
+++ b/language/fr_FR.iso-8859-1/common.lang.php
@@ -31,264 +31,6 @@ $lang_info['charset'] = 'iso-8859-1';
$lang_info['direction'] = 'ltr';
$lang_info['code'] = 'fr';
$lang_info['zero_plural'] = false;
-$lang_table_translate_ascii7bits = array(
- chr( 0) => chr(0),
- chr( 1) => chr( 1),
- chr( 2) => chr( 2),
- chr( 3) => chr( 3),
- chr( 4) => chr( 4),
- chr( 5) => chr( 5),
- chr( 6) => chr( 6),
- chr( 7) => chr( 7),
- chr( 8) => chr( 8),
- chr( 9) => chr( 9),
- chr( 10) => chr( 10),
- chr( 11) => chr( 11),
- chr( 12) => chr( 12),
- chr( 13) => chr( 13),
- chr( 14) => chr( 14),
- chr( 15) => chr( 15),
- chr( 16) => chr( 16),
- chr( 17) => chr( 17),
- chr( 18) => chr( 18),
- chr( 19) => chr( 19),
- chr( 20) => chr( 20),
- chr( 21) => chr( 21),
- chr( 22) => chr( 22),
- chr( 23) => chr( 23),
- chr( 24) => chr( 24),
- chr( 25) => chr( 25),
- chr( 26) => chr( 26),
- chr( 27) => chr( 27),
- chr( 28) => chr( 28),
- chr( 29) => chr( 29),
- chr( 30) => chr( 30),
- chr( 31) => chr( 31),
- chr( 32) => chr( 32),
- chr( 33) => chr( 33),
- chr( 34) => chr( 34),
- chr( 35) => chr( 35),
- chr( 36) => chr( 36),
- chr( 37) => chr( 37),
- chr( 38) => chr( 38),
- chr( 39) => chr( 39),
- chr( 40) => chr( 40),
- chr( 41) => chr( 41),
- chr( 42) => chr( 42),
- chr( 43) => chr( 43),
- chr( 44) => chr( 44),
- chr( 45) => chr( 45),
- chr( 46) => chr( 46),
- chr( 47) => chr( 47),
- chr( 48) => chr( 48),
- chr( 49) => chr( 49),
- chr( 50) => chr( 50),
- chr( 51) => chr( 51),
- chr( 52) => chr( 52),
- chr( 53) => chr( 53),
- chr( 54) => chr( 54),
- chr( 55) => chr( 55),
- chr( 56) => chr( 56),
- chr( 57) => chr( 57),
- chr( 58) => chr( 58),
- chr( 59) => chr( 59),
- chr( 60) => chr( 60),
- chr( 61) => chr( 61),
- chr( 62) => chr( 62),
- chr( 63) => chr( 63),
- chr( 64) => chr( 64),
- chr( 65) => chr( 65),
- chr( 66) => chr( 66),
- chr( 67) => chr( 67),
- chr( 68) => chr( 68),
- chr( 69) => chr( 69),
- chr( 70) => chr( 70),
- chr( 71) => chr( 71),
- chr( 72) => chr( 72),
- chr( 73) => chr( 73),
- chr( 74) => chr( 74),
- chr( 75) => chr( 75),
- chr( 76) => chr( 76),
- chr( 77) => chr( 77),
- chr( 78) => chr( 78),
- chr( 79) => chr( 79),
- chr( 80) => chr( 80),
- chr( 81) => chr( 81),
- chr( 82) => chr( 82),
- chr( 83) => chr( 83),
- chr( 84) => chr( 84),
- chr( 85) => chr( 85),
- chr( 86) => chr( 86),
- chr( 87) => chr( 87),
- chr( 88) => chr( 88),
- chr( 89) => chr( 89),
- chr( 90) => chr( 90),
- chr( 91) => chr( 91),
- chr( 92) => chr( 92),
- chr( 93) => chr( 93),
- chr( 94) => chr( 94),
- chr( 95) => chr( 95),
- chr( 96) => chr( 96),
- chr( 97) => chr( 97),
- chr( 98) => chr( 98),
- chr( 99) => chr( 99),
- chr(100) => chr(100),
- chr(101) => chr(101),
- chr(102) => chr(102),
- chr(103) => chr(103),
- chr(104) => chr(104),
- chr(105) => chr(105),
- chr(106) => chr(106),
- chr(107) => chr(107),
- chr(108) => chr(108),
- chr(109) => chr(109),
- chr(110) => chr(110),
- chr(111) => chr(111),
- chr(112) => chr(112),
- chr(113) => chr(113),
- chr(114) => chr(114),
- chr(115) => chr(115),
- chr(116) => chr(116),
- chr(117) => chr(117),
- chr(118) => chr(118),
- chr(119) => chr(119),
- chr(120) => chr(120),
- chr(121) => chr(121),
- chr(122) => chr(122),
- chr(123) => chr(123),
- chr(124) => chr(124),
- chr(125) => chr(125),
- chr(126) => chr(126),
- chr(127) => chr(127),
- chr(128) => chr(128),
- chr(129) => chr( 95),
- chr(130) => chr( 44),
- chr(131) => chr(102),
- chr(132) => chr( 44),
- chr(133) => chr( 46),
- chr(134) => chr( 43),
- chr(135) => chr( 43),
- chr(136) => chr( 32),
- chr(137) => chr( 37),
- chr(138) => chr( 83),
- chr(139) => chr( 60),
- chr(140) => chr( 69),
- chr(141) => chr( 32),
- chr(142) => chr( 90),
- chr(143) => chr( 32),
- chr(144) => chr( 32),
- chr(145) => chr( 39),
- chr(146) => chr( 39),
- chr(147) => chr( 34),
- chr(148) => chr( 34),
- chr(149) => chr( 46),
- chr(150) => chr( 45),
- chr(151) => chr( 45),
- chr(152) => chr( 32),
- chr(153) => chr( 32),
- chr(154) => chr(115),
- chr(155) => chr( 62),
- chr(156) => chr(111),
- chr(157) => chr( 32),
- chr(158) => chr(122),
- chr(159) => chr( 89),
- chr(160) => chr( 32),
- chr(161) => chr( 33),
- chr(162) => chr( 99),
- chr(163) => chr( 76),
- chr(164) => chr( 32),
- chr(165) => chr( 86),
- chr(166) => chr(124),
- chr(167) => chr( 83),
- chr(168) => chr( 32),
- chr(169) => chr( 99),
- chr(170) => chr( 97),
- chr(171) => chr( 60),
- chr(172) => chr( 32),
- chr(173) => chr( 45),
- chr(174) => chr( 114),
- chr(175) => chr( 45),
- chr(176) => chr( 111),
- chr(177) => chr( 43),
- chr(178) => chr( 50),
- chr(179) => chr( 51),
- chr(180) => chr( 39),
- chr(181) => chr(117),
- chr(182) => chr( 32),
- chr(183) => chr( 46),
- chr(184) => chr( 97),
- chr(185) => chr( 49),
- chr(186) => chr(111),
- chr(187) => chr( 62),
- chr(188) => chr( 32),
- chr(189) => chr( 32),
- chr(190) => chr( 32),
- chr(191) => chr( 63),
- chr(192) => chr( 65),
- chr(193) => chr( 65),
- chr(194) => chr( 65),
- chr(195) => chr( 65),
- chr(196) => chr( 65),
- chr(197) => chr( 65),
- chr(198) => chr( 65),
- chr(199) => chr( 67),
- chr(200) => chr( 69),
- chr(201) => chr( 69),
- chr(202) => chr( 69),
- chr(203) => chr( 69),
- chr(204) => chr( 73),
- chr(205) => chr( 73),
- chr(206) => chr( 73),
- chr(207) => chr( 73),
- chr(208) => chr( 68),
- chr(209) => chr( 78),
- chr(210) => chr( 79),
- chr(211) => chr( 79),
- chr(212) => chr( 79),
- chr(213) => chr( 79),
- chr(214) => chr( 79),
- chr(215) => chr( 42),
- chr(216) => chr( 48),
- chr(217) => chr( 85),
- chr(218) => chr( 85),
- chr(219) => chr( 85),
- chr(220) => chr( 85),
- chr(221) => chr( 89),
- chr(222) => chr( 80),
- chr(223) => chr( 66),
- chr(224) => chr( 97),
- chr(225) => chr( 97),
- chr(226) => chr( 97),
- chr(227) => chr( 97),
- chr(228) => chr( 97),
- chr(229) => chr( 97),
- chr(230) => chr( 97),
- chr(231) => chr( 99),
- chr(232) => chr(101),
- chr(233) => chr(101),
- chr(234) => chr(101),
- chr(235) => chr(101),
- chr(236) => chr(105),
- chr(237) => chr(105),
- chr(238) => chr(105),
- chr(239) => chr(105),
- chr(240) => chr( 97),
- chr(241) => chr(110),
- chr(242) => chr(111),
- chr(243) => chr(111),
- chr(244) => chr(111),
- chr(245) => chr(111),
- chr(246) => chr(111),
- chr(247) => chr( 47),
- chr(248) => chr( 48),
- chr(249) => chr(117),
- chr(250) => chr(117),
- chr(251) => chr(117),
- chr(252) => chr(117),
- chr(253) => chr(117),
- chr(254) => chr( 98),
- chr(255) => chr(121)
- );
$lang['%.2f (rated %d times, standard deviation = %.2f)'] = '%.2f (noté %d fois, écart type = %.2f)';
$lang['%d Kb'] = '%d Ko';
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-22 09:12:23 +0000