Commit 9521574b authored by Kasper Skårhøj's avatar Kasper Skårhøj
Browse files

* Added Hindi language

* Added feature to table-wizard: Will create 5 new rows when adding rows in the bottom of table (configurable)
* Added download links in extension listing in EM
* Added new feature, "submenuObjSuffixes" to TypoScript Menu objects to define alternative submenus depending on position of parent menu object in menu. (TSref documented)


git-svn-id: https://svn.typo3.org/TYPO3v4/Core/trunk@709 709f56b5-9817-0410-a4d7-c38de5d9e867
parent 153917be
2005-05-04 Kasper Skårhøj,,, <kasper@typo3.com>
* Added Hindi language
* Added feature to table-wizard: Will create 5 new rows when adding rows in the bottom of table (configurable)
* Added download links in extension listing in EM
* Added new feature, "submenuObjSuffixes" to TypoScript Menu objects to define alternative submenus depending on position of parent menu object in menu. (TSref documented)
2005-05-01 Michael Stucki <michael@typo3.org>
* Implemented a wrapper for executing ImageMagick
......
......@@ -447,7 +447,8 @@ class t3lib_cs {
'ba' => 'iso-8859-2',
'kr' => 'euc-kr',
'eo' => 'utf-8',
'my' => ''
'my' => '',
'hi' => 'utf-8',
);
// TYPO3 specific: Array with the iso names used for each system language in TYPO3:
......
......@@ -3543,27 +3543,27 @@ class t3lib_div {
$requireFile = t3lib_div::getFileAbsFileName($info['classFile']);
if (@is_file($requireFile)) {
require_once ($requireFile);
$obj = t3lib_div::makeInstance($info['className']);
if (is_object($obj)) {
if(!@is_callable(array($obj,'init'))) {
// use silent logging??? I don't think so.
die ('Broken service:'.t3lib_div::view_array($info));
}
$obj->info = $info;
if ($obj->init()) { // service available?
$obj = t3lib_div::makeInstance($info['className']);
if (is_object($obj)) {
if(!@is_callable(array($obj,'init'))) {
// use silent logging??? I don't think so.
die ('Broken service:'.t3lib_div::view_array($info));
}
$obj->info = $info;
if ($obj->init()) { // service available?
// create persistent object
$T3_VAR['makeInstanceService'][$info['className']] = &$obj;
// create persistent object
$T3_VAR['makeInstanceService'][$info['className']] = &$obj;
// needed to delete temp files
register_shutdown_function(array(&$obj, '__destruct'));
// needed to delete temp files
register_shutdown_function(array(&$obj, '__destruct'));
return $obj; // object is passed as reference by function definition
}
$error = $obj->getLastErrorArray();
unset($obj);
}
$error = $obj->getLastErrorArray();
unset($obj);
}
}
}
// deactivate the service
t3lib_extMgm::deactivateService($info['serviceType'],$info['serviceKey']);
......
......@@ -483,8 +483,8 @@ class t3lib_extMgm {
// even not available services will be included to make it possible to give the admin a feedback of non-available services.
// but maybe it's better to move non-available services to a different array??
if ($serviceType AND
!t3lib_div::isFirstPartOfStr($serviceType, 'tx_') AND
if ($serviceType AND
!t3lib_div::isFirstPartOfStr($serviceType, 'tx_') AND
(t3lib_div::isFirstPartOfStr($serviceKey, 'tx_') OR t3lib_div::isFirstPartOfStr($serviceKey, 'user_')) AND
is_array($info)) {
......@@ -950,27 +950,26 @@ tt_content.'.$key.$prefix.' {
foreach($temp_extensions as $temp_extKey) {
// Check local, global and system locations:
if (@is_dir(PATH_site.'typo3conf/ext/'.$temp_extKey.'/')) {
$extensions[$temp_extKey]=array('type'=>'L','siteRelPath'=>'typo3conf/ext/'.$temp_extKey.'/','typo3RelPath'=>'../typo3conf/ext/'.$temp_extKey.'/');
$extensions[$temp_extKey] = array('type'=>'L', 'siteRelPath'=>'typo3conf/ext/'.$temp_extKey.'/', 'typo3RelPath'=>'../typo3conf/ext/'.$temp_extKey.'/');
} elseif (@is_dir(PATH_site.TYPO3_mainDir.'ext/'.$temp_extKey.'/')) {
$extensions[$temp_extKey]=array('type'=>'G','siteRelPath'=>TYPO3_mainDir.'ext/'.$temp_extKey.'/','typo3RelPath'=>'ext/'.$temp_extKey.'/');
$extensions[$temp_extKey] = array('type'=>'G', 'siteRelPath'=>TYPO3_mainDir.'ext/'.$temp_extKey.'/', 'typo3RelPath'=>'ext/'.$temp_extKey.'/');
} elseif (@is_dir(PATH_site.TYPO3_mainDir.'sysext/'.$temp_extKey.'/')) {
$extensions[$temp_extKey]=array('type'=>'S','siteRelPath'=>TYPO3_mainDir.'sysext/'.$temp_extKey.'/','typo3RelPath'=>'sysext/'.$temp_extKey.'/');
$extensions[$temp_extKey] = array('type'=>'S', 'siteRelPath'=>TYPO3_mainDir.'sysext/'.$temp_extKey.'/', 'typo3RelPath'=>'sysext/'.$temp_extKey.'/');
}
// If extension was found, check for reserved filenames:
if (isset($extensions[$temp_extKey])) {
foreach($files as $fName) {
$temp_filename = PATH_site.$extensions[$temp_extKey]['siteRelPath'].trim($fName);
if (is_array($extensions[$temp_extKey]) && @is_file($temp_filename)) {
$extensions[$temp_extKey][$fName]=$temp_filename;
$temp_filename = PATH_site.$extensions[$temp_extKey]['siteRelPath'].trim($fName);
if (is_array($extensions[$temp_extKey]) && @is_file($temp_filename)) {
$extensions[$temp_extKey][$fName] = $temp_filename;
}
}
}
}
}
unset($extensions['_CACHEFILE']);
// write cache?
// write cache?
if ($TYPO3_CONF_VARS['EXT']['extCache'] &&
@is_dir(PATH_site.TYPO3_mainDir.'sysext/') &&
@is_dir(PATH_site.TYPO3_mainDir.'ext/')) { // Must also find global and system extension directories to exist, otherwise caching cannot be allowed (since it is most likely a temporary server problem). This might fix a rare, unrepeatable bug where global/system extensions are not loaded resulting in fatal errors if that is cached!
......@@ -978,7 +977,7 @@ tt_content.'.$key.$prefix.' {
if ($wrError) {
$TYPO3_CONF_VARS['EXT']['extCache']=0;
} else {
// Write cache files:
// Write cache files:
$extensions = t3lib_extMgm::writeCacheFiles($extensions,$cacheFilePrefix);
}
}
......
......@@ -1798,7 +1798,7 @@ class t3lib_TCEmain {
* Deletes a flex form element
*
* @param array &$valueArrayToRemoveFrom: by reference
* @param [type] $deleteCMDS: ... *
* @param [type] $deleteCMDS: ... *
* @return void
*/
function _DELETE_FLEX_FORMdata(&$valueArrayToRemoveFrom,$deleteCMDS) {
......@@ -1818,7 +1818,7 @@ class t3lib_TCEmain {
*
* @param array &$valueArrayToMoveIn: by reference
* @param [type] $moveCMDS: ... *
* @param string $direction: 'up' or 'down'
* @param string $direction: 'up' or 'down'
* @return void
* TODO: Like _DELETE_FLEX_FORMdata, this is only a temporary solution!
*/
......@@ -1827,7 +1827,7 @@ class t3lib_TCEmain {
// Only execute the first move command:
list ($key, $value) = each ($moveCMDS);
if (is_array($moveCMDS[$key])) {
$this->_MOVE_FLEX_FORMdata($valueArrayToMoveIn[$key],$moveCMDS[$key], $direction);
} else {
......@@ -1836,16 +1836,16 @@ class t3lib_TCEmain {
if ($key > 1) {
$tmpArr = $valueArrayToMoveIn[$key];
$valueArrayToMoveIn[$key] = $valueArrayToMoveIn[$key-1];
$valueArrayToMoveIn[$key-1] = $tmpArr;
$valueArrayToMoveIn[$key-1] = $tmpArr;
}
break;
case 'down':
if ($key < count($valueArrayToMoveIn)) {
$tmpArr = $valueArrayToMoveIn[$key];
$valueArrayToMoveIn[$key] = $valueArrayToMoveIn[$key+1];
$valueArrayToMoveIn[$key+1] = $tmpArr;
$valueArrayToMoveIn[$key+1] = $tmpArr;
}
break;
break;
}
}
}
......
......@@ -266,7 +266,7 @@ define('TYPO3_extTableDef_script', $typo_db_extTableDef_script);
// - Kickstarter wizard (ext/kickstarter/class.tx_kickstarter_wizard.php)
// - Add character encoding for lang key in t3lib/class.t3lib_cs.php
// - Add "csh_[key]" language pack and setup all core ll-XML scripts to point to XML files inside of that. (Kasper: see typo3_l10n/README.prepare_languages.txt)
define('TYPO3_languages', 'default|dk|de|no|it|fr|es|nl|cz|pl|si|fi|tr|se|pt|ru|ro|ch|sk|lt|is|hr|hu|gl|th|gr|hk|eu|bg|br|et|ar|he|ua|lv|jp|vn|ca|ba|kr|eo|my');
define('TYPO3_languages', 'default|dk|de|no|it|fr|es|nl|cz|pl|si|fi|tr|se|pt|ru|ro|ch|sk|lt|is|hr|hu|gl|th|gr|hk|eu|bg|br|et|ar|he|ua|lv|jp|vn|ca|ba|kr|eo|my|hi');
// Unsetting the configured values. Use of these are depreciated.
unset($typo_db);
......
......@@ -295,6 +295,7 @@ $TCA['be_users'] = Array (
Array('Greek', 'gr'),
Array('Greenlandic', 'gl'),
Array('Hebrew', 'he'),
Array('Hindi', 'hi'),
Array('Hungarian', 'hu'),
Array('Icelandic', 'is'),
Array('Italian', 'it'),
......
......@@ -2039,6 +2039,7 @@ EXTENSION KEYS:
$cells[] = '<td>Extension key:</td>';
$cells[] = '<td>Version:</td>';
if (!$import) {
$cells[] = '<td>DL:</td>';
$cells[] = '<td>Doc:</td>';
$cells[] = '<td>Type:</td>';
} else {
......@@ -2144,10 +2145,13 @@ EXTENSION KEYS:
$cells[] = '<td nowrap="nowrap"><em>'.$extKey.'</em></td>';
$cells[] = '<td nowrap="nowrap">'.($verDiff ? '<strong>'.$GLOBALS['TBE_TEMPLATE']->rfw(htmlspecialchars($extInfo['EM_CONF']['version'])).'</strong>' : $extInfo['EM_CONF']['version']).'</td>';
if (!$import) { // Listing extenson on LOCAL server:
$fileP = PATH_site.$this->typePaths[$extInfo['type']].$extKey.'/doc/manual.sxw';
// Extension Download:
$cells[] = '<td nowrap="nowrap"><a href="'.htmlspecialchars('index.php?CMD[doBackup]=1&CMD[showExt]='.$extKey).'"><img src="download.png" width="13" height="12" title="Download" alt="" /></a></td>';
// Manual download
$fileP = PATH_site.$this->typePaths[$extInfo['type']].$extKey.'/doc/manual.sxw';
$cells[] = '<td nowrap="nowrap">'.
($this->typePaths[$extInfo['type']] && @is_file($fileP)?'<img src="oodoc.gif" width="13" height="16" title="Local Open Office Manual" alt="" />':'').
($this->typePaths[$extInfo['type']] && @is_file($fileP)?'<a href="'.htmlspecialchars(t3lib_div::resolveBackPath($this->doc->backPath.'../'.$this->typePaths[$extInfo['type']].$extKey.'/doc/manual.sxw')).'" target="_blank"><img src="oodoc.gif" width="13" height="16" title="Local Open Office Manual" alt="" /></a>':'').
'</td>';
$cells[] = '<td nowrap="nowrap">'.$this->typeLabels[$extInfo['type']].(strlen($extInfo['doubleInstall'])>1?'<strong> '.$GLOBALS['TBE_TEMPLATE']->rfw($extInfo['doubleInstall']).'</strong>':'').'</td>';
} else { // Listing extensions from REMOTE repository:
......
......@@ -60,5 +60,6 @@
<languageKey index="kr">EXT:csh_kr/aboutmodules/mod/kr.locallang_mod.xml</languageKey>
<languageKey index="eo">EXT:csh_eo/aboutmodules/mod/eo.locallang_mod.xml</languageKey>
<languageKey index="my">EXT:csh_my/aboutmodules/mod/my.locallang_mod.xml</languageKey>
<languageKey index="hi">EXT:csh_hi/aboutmodules/mod/hi.locallang_mod.xml</languageKey>
</data>
</T3locallang>
\ No newline at end of file
......@@ -71,6 +71,7 @@
<languageKey index="kr">EXT:csh_kr/belog/kr.locallang.xml</languageKey>
<languageKey index="eo">EXT:csh_eo/belog/eo.locallang.xml</languageKey>
<languageKey index="my">EXT:csh_my/belog/my.locallang.xml</languageKey>
<languageKey index="hi">EXT:csh_hi/belog/hi.locallang.xml</languageKey>
</data>
<orig_hash type="array">
<languageKey index="default" type="array">
......
......@@ -99,6 +99,7 @@
<languageKey index="kr">EXT:csh_kr/belog/mod/kr.locallang.xml</languageKey>
<languageKey index="eo">EXT:csh_eo/belog/mod/eo.locallang.xml</languageKey>
<languageKey index="my">EXT:csh_my/belog/mod/my.locallang.xml</languageKey>
<languageKey index="hi">EXT:csh_hi/belog/mod/hi.locallang.xml</languageKey>
</data>
<orig_hash type="array">
<languageKey index="default" type="array">
......
......@@ -55,6 +55,7 @@
<languageKey index="kr">EXT:csh_kr/belog/mod/kr.locallang_mod.xml</languageKey>
<languageKey index="eo">EXT:csh_eo/belog/mod/eo.locallang_mod.xml</languageKey>
<languageKey index="my">EXT:csh_my/belog/mod/my.locallang_mod.xml</languageKey>
<languageKey index="hi">EXT:csh_hi/belog/mod/hi.locallang_mod.xml</languageKey>
</data>
<orig_hash type="array">
<languageKey index="default" type="array">
......
......@@ -60,6 +60,7 @@
<languageKey index="kr">EXT:csh_kr/beuser/mod/kr.locallang_mod.xml</languageKey>
<languageKey index="eo">EXT:csh_eo/beuser/mod/eo.locallang_mod.xml</languageKey>
<languageKey index="my">EXT:csh_my/beuser/mod/my.locallang_mod.xml</languageKey>
<languageKey index="hi">EXT:csh_hi/beuser/mod/hi.locallang_mod.xml</languageKey>
</data>
<orig_hash type="array">
<languageKey index="default" type="array">
......
......@@ -128,5 +128,6 @@
<languageKey index="kr">EXT:csh_kr/cms/layout/kr.locallang.xml</languageKey>
<languageKey index="eo">EXT:csh_eo/cms/layout/eo.locallang.xml</languageKey>
<languageKey index="my">EXT:csh_my/cms/layout/my.locallang.xml</languageKey>
<languageKey index="hi">EXT:csh_hi/cms/layout/hi.locallang.xml</languageKey>
</data>
</T3locallang>
\ No newline at end of file
......@@ -87,5 +87,6 @@
<languageKey index="kr">EXT:csh_kr/cms/layout/kr.locallang_db_new_content_el.xml</languageKey>
<languageKey index="eo">EXT:csh_eo/cms/layout/eo.locallang_db_new_content_el.xml</languageKey>
<languageKey index="my">EXT:csh_my/cms/layout/my.locallang_db_new_content_el.xml</languageKey>
<languageKey index="hi">EXT:csh_hi/cms/layout/hi.locallang_db_new_content_el.xml</languageKey>
</data>
</T3locallang>
\ No newline at end of file
......@@ -56,5 +56,6 @@
<languageKey index="kr">EXT:csh_kr/cms/layout/kr.locallang_mod.xml</languageKey>
<languageKey index="eo">EXT:csh_eo/cms/layout/eo.locallang_mod.xml</languageKey>
<languageKey index="my">EXT:csh_my/cms/layout/my.locallang_mod.xml</languageKey>
<languageKey index="hi">EXT:csh_hi/cms/layout/hi.locallang_mod.xml</languageKey>
</data>
</T3locallang>
\ No newline at end of file
......@@ -138,5 +138,6 @@ Will show the total number of page hits/sessions within main sections of a websi
<languageKey index="he">EXT:csh_he/cms/he.locallang_csh_webinfo.xml</languageKey>
<languageKey index="eo">EXT:csh_eo/cms/eo.locallang_csh_webinfo.xml</languageKey>
<languageKey index="my">EXT:csh_my/cms/my.locallang_csh_webinfo.xml</languageKey>
<languageKey index="hi">EXT:csh_hi/cms/hi.locallang_csh_webinfo.xml</languageKey>
</data>
</T3locallang>
\ No newline at end of file
......@@ -149,5 +149,6 @@ xMOD_csh_corebe:new_ce,</label>
<languageKey index="de">EXT:csh_de/cms/de.locallang_csh_weblayout.xml</languageKey>
<languageKey index="eo">EXT:csh_eo/cms/eo.locallang_csh_weblayout.xml</languageKey>
<languageKey index="my">EXT:csh_my/cms/my.locallang_csh_weblayout.xml</languageKey>
<languageKey index="hi">EXT:csh_hi/cms/hi.locallang_csh_weblayout.xml</languageKey>
</data>
</T3locallang>
\ No newline at end of file
......@@ -126,5 +126,6 @@
<languageKey index="kr">EXT:csh_kr/cms/kr.locallang_tca.xml</languageKey>
<languageKey index="eo">EXT:csh_eo/cms/eo.locallang_tca.xml</languageKey>
<languageKey index="my">EXT:csh_my/cms/my.locallang_tca.xml</languageKey>
<languageKey index="hi">EXT:csh_hi/cms/hi.locallang_tca.xml</languageKey>
</data>
</T3locallang>
\ No newline at end of file
......@@ -241,5 +241,6 @@
<languageKey index="kr">EXT:csh_kr/cms/kr.locallang_ttc.xml</languageKey>
<languageKey index="eo">EXT:csh_eo/cms/eo.locallang_ttc.xml</languageKey>
<languageKey index="my">EXT:csh_my/cms/my.locallang_ttc.xml</languageKey>
<languageKey index="hi">EXT:csh_hi/cms/hi.locallang_ttc.xml</languageKey>
</data>
</T3locallang>
\ No newline at end of file
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment