Index: t3lib/class.t3lib_recordlist.php
===================================================================
--- t3lib/class.t3lib_recordlist.php (Revision 8770)
+++ t3lib/class.t3lib_recordlist.php (Arbeitskopie)
@@ -374,7 +374,8 @@
* @return string Language icon
*/
function languageFlag($sys_language_uid) {
- return ($this->languageIconTitles[$sys_language_uid]['flagIcon'] ? ' ' : '').
+ t3lib_div::debug($this->languageIconTitles[$sys_language_uid]['flagIcon']);
+ return ($this->languageIconTitles[$sys_language_uid]['flagIcon'] ? t3lib_iconWorks::getSpriteIcon($this->languageIconTitles[$sys_language_uid]['flagIcon']) . ' ' : '') .
htmlspecialchars($this->languageIconTitles[$sys_language_uid]['title']);
}
Index: t3lib/class.t3lib_tceforms.php
===================================================================
--- t3lib/class.t3lib_tceforms.php (Revision 8770)
+++ t3lib/class.t3lib_tceforms.php (Arbeitskopie)
@@ -6183,7 +6183,7 @@
}
}
- return ($this->cachedLanguageFlag[$mainKey][$sys_language_uid]['flagIcon'] ? '' : ($this->cachedLanguageFlag[$mainKey][$sys_language_uid]['title'] ? '['.$this->cachedLanguageFlag[$mainKey][$sys_language_uid]['title'].']' : '')).' ';
+ return ($this->cachedLanguageFlag[$mainKey][$sys_language_uid]['flagIcon'] ? t3lib_iconWorks::getSpriteIcon($this->cachedLanguageFlag[$mainKey][$sys_language_uid]['flagIcon']) : ($this->cachedLanguageFlag[$mainKey][$sys_language_uid]['title'] ? '['.$this->cachedLanguageFlag[$mainKey][$sys_language_uid]['title'].']' : '')).' ';
}
/**
Index: t3lib/class.t3lib_transl8tools.php
===================================================================
--- t3lib/class.t3lib_transl8tools.php (Revision 8770)
+++ t3lib/class.t3lib_transl8tools.php (Arbeitskopie)
@@ -75,20 +75,18 @@
function getSystemLanguages($page_id=0,$backPath='') {
global $TCA,$LANG;
- // Icons and language titles:
- t3lib_div::loadTCA('sys_language');
- $flagAbsPath = t3lib_div::getFileAbsFileName($TCA['sys_language']['columns']['flag']['config']['fileFolder']);
- $flagIconPath = $backPath.'../'.substr($flagAbsPath, strlen(PATH_site));
-
$modSharedTSconfig = t3lib_BEfunc::getModTSconfig($page_id, 'mod.SHARED');
$languageIconTitles = array();
+ if (($pos = strrpos($modSharedTSconfig['properties']['defaultLanguageFlag'], '.')) !== FALSE) {
+ $modSharedTSconfig['properties']['defaultLanguageFlag'] = substr($modSharedTSconfig['properties']['defaultLanguageFlag'], 0, - $pos);
+ }
// Set default:
$languageIconTitles[0] = array(
'uid' => 0,
'title' => strlen ($modSharedTSconfig['properties']['defaultLanguageLabel']) ? $modSharedTSconfig['properties']['defaultLanguageLabel'].' ('.$LANG->getLL('defaultLanguage').')' : $LANG->getLL('defaultLanguage'),
'ISOcode' => 'DEF',
- 'flagIcon' => strlen($modSharedTSconfig['properties']['defaultLanguageFlag']) && @is_file($flagAbsPath.$modSharedTSconfig['properties']['defaultLanguageFlag']) ? $flagIconPath.$modSharedTSconfig['properties']['defaultLanguageFlag'] : null,
+ 'flagIcon' => strlen($modSharedTSconfig['properties']['defaultLanguageFlag']) ? 'flags-' . $modSharedTSconfig['properties']['defaultLanguageFlag'] : '',
);
// Set "All" language:
@@ -96,7 +94,7 @@
'uid' => -1,
'title' => $LANG->getLL('multipleLanguages'),
'ISOcode' => 'DEF',
- 'flagIcon' => $flagIconPath.'multi-language.gif',
+ 'flagIcon' => 'flags-multiple',
);
// Find all system languages:
@@ -115,7 +113,7 @@
}
}
if (strlen ($row['flag'])) {
- $languageIconTitles[$row['uid']]['flagIcon'] = @is_file($flagAbsPath.$row['flag']) ? $flagIconPath.$row['flag'] : '';
+ $languageIconTitles[$row['uid']]['flagIcon'] = 'flags-' . $row['flag'];
}
}
Index: t3lib/class.t3lib_befunc.php
===================================================================
--- t3lib/class.t3lib_befunc.php (Revision 8770)
+++ t3lib/class.t3lib_befunc.php (Arbeitskopie)
@@ -871,7 +871,7 @@
$sysLanguages[] = array(
htmlspecialchars($row['title']) . ' [' . $row['uid'] . ']',
$row['uid'],
- ($row['flag'] ? 'flags/' . $row['flag'] : '')
+ 'flags-' . $row['flag']
);
}
$GLOBALS['TYPO3_DB']->sql_free_result($res);
Index: typo3/alt_doc.php
===================================================================
--- typo3/alt_doc.php (Revision 8770)
+++ typo3/alt_doc.php (Arbeitskopie)
@@ -1209,6 +1209,10 @@
$modSharedTSconfig = t3lib_BEfunc::getModTSconfig($id, 'mod.SHARED');
+ if (($pos = strrpos($modSharedTSconfig['properties']['defaultLanguageFlag'], '.')) !== FALSE) {
+ $modSharedTSconfig['properties']['defaultLanguageFlag'] = substr($modSharedTSconfig['properties']['defaultLanguageFlag'], 0, - $pos);
+ }
+
$languages = array(
0 => array(
'uid' => 0,