Feature #20067 ยป rtehtmlarea_feature_10510.patch
| typo3/sysext/rtehtmlarea/class.tx_rtehtmlarea_base.php (copie de travail) | ||
|---|---|---|
|
$this->language='en';
|
||
|
}
|
||
|
$this->contentTypo3Language = $this->language;
|
||
|
$this->contentISOLanguage = 'en';
|
||
|
$this->contentLanguageUid = ($row['sys_language_uid'] > 0) ? $row['sys_language_uid'] : 0;
|
||
|
if (t3lib_extMgm::isLoaded('static_info_tables')) {
|
||
|
if ($this->contentLanguageUid) {
|
||
| ... | ... | |
|
$this->contentTypo3Language = strtolower(trim($languageRow['lg_typo3']));
|
||
|
}
|
||
|
} else {
|
||
|
$this->contentISOLanguage = trim($TYPO3_CONF_VARS['EXTCONF'][$this->ID]['defaultDictionary']) ? trim($TYPO3_CONF_VARS['EXTCONF'][$this->ID]['defaultDictionary']) : 'en';
|
||
|
$this->contentISOLanguage = trim($this->thisConfig['defaultContentLanguage']) ? trim($this->thisConfig['defaultContentLanguage']) : 'en';
|
||
|
$selectFields = 'lg_iso_2, lg_typo3';
|
||
|
$tableAB = 'static_languages';
|
||
|
$whereClause = 'lg_iso_2 = ' . $TYPO3_DB->fullQuoteStr(strtoupper($this->contentISOLanguage), $tableAB);
|
||
| typo3/sysext/rtehtmlarea/pi2/class.tx_rtehtmlarea_pi2.php (copie de travail) | ||
|---|---|---|
|
if ($this->language == 'default' || !$this->language) {
|
||
|
$this->language = 'en';
|
||
|
}
|
||
|
$this->contentISOLanguage = $TYPO3_CONF_VARS['EXTCONF']['rtehtmlarea']['defaultDictionary'];
|
||
|
$this->contentLanguageUid = ($row['sys_language_uid'] > 0) ? $row['sys_language_uid'] : 0;
|
||
|
if (t3lib_extMgm::isLoaded('static_info_tables')) {
|
||
|
if ($this->contentLanguageUid) {
|
||
| ... | ... | |
|
$this->contentTypo3Language = strtolower(trim($languageRow['lg_typo3']));
|
||
|
}
|
||
|
} else {
|
||
|
$this->contentISOLanguage = trim($TYPO3_CONF_VARS['EXTCONF'][$this->ID]['defaultDictionary']) ? trim($TYPO3_CONF_VARS['EXTCONF'][$this->ID]['defaultDictionary']) : 'en';
|
||
|
$this->contentISOLanguage = $GLOBALS['TSFE']->sys_language_isocode ? $GLOBALS['TSFE']->sys_language_isocode : 'en';
|
||
|
$selectFields = 'lg_iso_2, lg_typo3';
|
||
|
$tableAB = 'static_languages';
|
||
|
$whereClause = 'lg_iso_2 = ' . $TYPO3_DB->fullQuoteStr(strtoupper($this->contentISOLanguage), $tableAB);
|
||
| ... | ... | |
|
}
|
||
|
}
|
||
|
}
|
||
|
$this->contentISOLanguage = $this->contentISOLanguage?$this->contentISOLanguage:$this->language;
|
||
|
$this->contentTypo3Language = $this->contentTypo3Language?$this->contentTypo3Language:$TSFE->lang;
|
||
|
$this->contentISOLanguage = $this->contentISOLanguage ? $this->contentISOLanguage : ($GLOBALS['TSFE']->sys_language_isocode ? $GLOBALS['TSFE']->sys_language_isocode : 'en');
|
||
|
$this->contentTypo3Language = $this->contentTypo3Language ? $this->contentTypo3Language : $GLOBALS['TSFE']->lang;
|
||
|
if ($this->contentTypo3Language == 'default') {
|
||
|
$this->contentTypo3Language = 'en';
|
||
|
}
|
||