Project

General

Profile

Feature #19495 » 9622.patch

Administrator Admin, 2010-05-06 03:59

View differences:

t3lib/class.t3lib_div.php (Arbeitskopie)
// converting the default language (English)
// this needs to be done for a few accented loan words and extension names
if (is_array($LOCAL_LANG['default']) && $targetCharset != 'iso-8859-1') {
foreach ($LOCAL_LANG['default'] as &$labelValue) {
foreach ($LOCAL_LANG['default'] as &$labelValue) {
$labelValue = $csConvObj->conv($labelValue, 'iso-8859-1', $targetCharset);
}
}
......
// this needs to be done for a few accented loan words and extension names
// NOTE: no conversion is done when in UTF-8 mode!
if (is_array($LOCAL_LANG['default']) && $targetCharset != 'utf-8') {
foreach ($LOCAL_LANG['default'] as &$labelValue) {
foreach ($LOCAL_LANG['default'] as &$labelValue) {
$labelValue = $csConvObj->utf8_decode($labelValue, $targetCharset);
}
unset($labelValue);
......
// Checking if charset should be converted.
if (is_array($LOCAL_LANG[$langKey]) && $targetCharset!='utf-8') {
foreach($LOCAL_LANG[$langKey] as $labelKey => $labelValue) {
$LOCAL_LANG[$langKey][$labelKey] = $csConvObj->utf8_decode($labelValue,$targetCharset);
foreach ($LOCAL_LANG[$langKey] as &$labelValue) {
$labelValue = $csConvObj->utf8_decode($labelValue, $targetCharset);
}
}
}
......
// Checking if charset should be converted.
if (is_array($LOCAL_LANG[$langKey]) && $targetCharset!='utf-8') {
foreach($LOCAL_LANG[$langKey] as $labelKey => $labelValue) {
$LOCAL_LANG[$langKey][$labelKey] = $csConvObj->utf8_decode($labelValue,$targetCharset);
foreach ($LOCAL_LANG[$langKey] as &$labelValue) {
$labelValue = $csConvObj->utf8_decode($labelValue, $targetCharset);
}
}
(2-2/2)