From abaad8048aa87a6a3d6f8ef27650bb2c740ece06 Mon Sep 17 00:00:00 2001 From: Rupert Germann Date: Wed, 16 Sep 2009 12:58:44 +0000 Subject: [PATCH] Fixed bug #11905: Extension Manager is not translatable (part 3) (thanks to Christopher Stelmaszyk) git-svn-id: https://svn.typo3.org/TYPO3v4/Core/trunk@5944 709f56b5-9817-0410-a4d7-c38de5d9e867 --- ChangeLog | 1 + typo3/mod/tools/em/class.em_index.php | 170 +++++++++++++------ typo3/sysext/lang/locallang_mod_tools_em.xml | 52 ++++++ 3 files changed, 169 insertions(+), 54 deletions(-) diff --git a/ChangeLog b/ChangeLog index 9a5bd46e4469..e513e72f4eb0 100755 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,6 @@ 2009-09-16 Rupert Germann + * Fixed bug #11905: Extension Manager is not translatable (part 3) (thanks to Christopher Stelmaszyk) * Added feature #11927: Use suggest feature in system extensions * Fixed bug #11967: allowSystemInstall should be a checkbox and not an input field (thanks to Georg Ringer) diff --git a/typo3/mod/tools/em/class.em_index.php b/typo3/mod/tools/em/class.em_index.php index 6c2188f58257..68b0480844dc 100644 --- a/typo3/mod/tools/em/class.em_index.php +++ b/typo3/mod/tools/em/class.em_index.php @@ -913,15 +913,15 @@ EXTENSION KEYS: if ($inst_list[$extKey]['EM_CONF']['state'] != 'excludeFromUpdates') { $loc= ($inst_list[$extKey]['type']=='G'?'G':'L'); $aUrl = 'index.php?CMD[importExt]='.$extKey.'&CMD[extVersion]='.$version.'&CMD[loc]='.$loc; - $loadUnloadLink.= ''; + $loadUnloadLink .= ''; } else { // extension is marked as "excludeFromUpdates" - $loadUnloadLink.= ''; + $loadUnloadLink .= ''; } } else { // import $aUrl = 'index.php?CMD[importExt]='.$extKey.'&CMD[extVersion]='.$version.'&CMD[loc]=L'; - $loadUnloadLink.= ''; + $loadUnloadLink .= ''; } } else { $loadUnloadLink = ' '; @@ -943,8 +943,17 @@ EXTENSION KEYS: // CSH: $content .= t3lib_BEfunc::cshItem('_MOD_tools_em', 'import_ter', $GLOBALS['BACK_PATH'], '|
'); $onsubmit = "window.location.href='index.php?ter_connect=1&ter_search='+escape(this.elements['_lookUp'].value);return false;"; - $content.= '

-


'; + $content .= '

+


'; $content .= $this->browseLinks(); @@ -954,9 +963,11 @@ EXTENSION KEYS: '.implode(chr(10),$lines).'
'; $content .= '
'.$this->browseLinks(); $content.= '

'.$this->securityHint; - $content.= '

PRIVACY NOTICE:
'.$this->privacyNotice; + $content .= '

' . $GLOBALS['LANG']->getLL('privacy_notice_header') . + '
' . $this->privacyNotice; - $this->content.=$this->doc->section('Extensions in TYPO3 Extension Repository (online) - Grouped by: '.$this->MOD_MENU['listOrder'][$this->MOD_SETTINGS['listOrder']],$content,0,1); + $this->content .= $this->doc->section($GLOBALS['LANG']->getLL('extensions_repository_group_by') . ' ' . + $this->MOD_MENU['listOrder'][$this->MOD_SETTINGS['listOrder']], $content, 0, 1); // Plugins which are NOT uploaded to repository but present on this server. $content=''; @@ -975,69 +986,98 @@ EXTENSION KEYS: } } if(count($lines)) { - $content.= 'This is the list of extensions which are available locally, but not in the repository.
They might be user-defined and should be prepended user_ then.

'; + $content .= $GLOBALS['LANG']->getLL('list_of_local_extensions') . + '
' . $GLOBALS['LANG']->getLL('might_be_user_defined') . '

'; $content.= ''. $this->extensionListRowHeader(' class="bgColor5"',array('')). implode('',$lines).'
'; $this->content.=$this->doc->spacer(20); - $this->content.=$this->doc->section('Extensions found only on this server',$content,0,1); + $this->content.=$this->doc->section($GLOBALS['LANG']->getLL('only_on_this_server'), $content, 0, 1); } } } else { $content .= t3lib_BEfunc::cshItem('_MOD_tools_em', 'import_ter', $GLOBALS['BACK_PATH'], '|
'); $onsubmit = "window.location.href='index.php?ter_connect=1&ter_search='+escape(this.elements['_lookUp'].value);return false;"; - $content.= '

-


'; - - $content.= '

No matching extensions found.

'; - - $content.= '

PRIVACY NOTICE:
'.$this->privacyNotice; - $this->content.=$this->doc->section('Extensions in TYPO3 Extension Repository (online) - Grouped by: '.$this->MOD_MENU['listOrder'][$this->MOD_SETTINGS['listOrder']],$content,0,1); + $content .= '

+


'; + + $content .= '

' . $GLOBALS['LANG']->getLL('no_matching_extensions') . '

'; + + $content .= '

' . $GLOBALS['LANG']->getLL('privacy_notice_header') . + '
' . $this->privacyNotice; + $this->content.=$this->doc->section($GLOBALS['LANG']->getLL('extensions_repository_group_by') . ' ' . + $this->MOD_MENU['listOrder'][$this->MOD_SETTINGS['listOrder']], $content, 0, 1); } } else { // CSH $content .= t3lib_BEfunc::cshItem('_MOD_tools_em', 'import', $GLOBALS['BACK_PATH'], '|
'); $onsubmit = "window.location.href='index.php?ter_connect=1&ter_search='+escape(this.elements['_lookUp'].value);return false;"; - $content.= '

-

'; + $content .= '
+

'; if ($this->CMD['fetchMetaData']) { // fetches mirror/extension data from online rep. $content .= $this->fetchMetaData($this->CMD['fetchMetaData']); } else { $onCLick = "window.location.href='index.php?CMD[fetchMetaData]=extensions';return false;"; - $content.= 'Connect to the current mirror and retrieve the current list of available plugins from the TYPO3 Extension Repository.
- '; + $content .= $GLOBALS['LANG']->getLL('connect_to_ter') . '
+ '; if (is_file(PATH_site.'typo3temp/extensions.xml.gz')) { $dateFormat = $GLOBALS['TYPO3_CONF_VARS']['SYS']['ddmmyy']; $timeFormat = $GLOBALS['TYPO3_CONF_VARS']['SYS']['hhmm']; - $content.= ' (last update: '.date($dateFormat.' '.$timeFormat,filemtime(PATH_site.'typo3temp/extensions.xml.gz')).')'; + $content .= ' ' . sprintf($GLOBALS['LANG']->getLL('ext_list_last_updated') . ' ', + date( + $dateFormat . ', ' . $timeFormat, + filemtime(PATH_site . 'typo3temp/extensions.xml.gz') + ) + ); } } $content.= '


'.$this->securityHint; - $content.= '

PRIVACY NOTICE:
'.$this->privacyNotice; + $content .= '

' . $GLOBALS['LANG']->getLL('privacy_notice_header') . + '
' . $this->privacyNotice; - $this->content.=$this->doc->section('Extensions in TYPO3 Extension Repository',$content,0,1); + $this->content.=$this->doc->section($GLOBALS['LANG']->getLL('in_repository'), $content, 0, 1); } // Upload: if ($this->importAtAll()) { $content= '
-
-
- ... to location:
+
+
' . + $GLOBALS['LANG']->getLL('upload_to_location') . '

-
-

+
+
'; } else $content=$this->noImportMsg(); $this->content.=$this->doc->spacer(20); - $this->content.=$this->doc->section('Upload extension file directly (.t3x):',$content,0,1); + $this->content .= $this->doc->section($GLOBALS['LANG']->getLL('upload_ext_directly'), $content, 0, 1); } /** @@ -1048,17 +1088,29 @@ EXTENSION KEYS: function browseLinks() { $content = ''; if ($this->pointer) { - $content .= ' Prev page'; + $content .= ' ' . + $GLOBALS['LANG']->getLL('previous_page') . ''; } if ($content) $content .= '   '; if (intval($this->xmlhandler->matchingCount/$this->listingLimit)>$this->pointer) { - $content .= ' Next page'; + $content .= ' ' . + $GLOBALS['LANG']->getLL('next_page') . ''; } $upper = (($this->pointer+1)*$this->listingLimit); if ($upper>$this->xmlhandler->matchingCount) { $upper = $this->xmlhandler->matchingCount; } - if ($content) $content .= '

Showing extensions '.($this->pointer*$this->listingLimit+1).' to '.$upper.''; + if ($content) $content .= '

' . + sprintf($GLOBALS['LANG']->getLL('showing_extensions_from_to'), + '' . ($this->pointer*$this->listingLimit+1) . '', + '' . $upper . '' + ); if ($content) $content .= '

'; return $content; } @@ -1074,57 +1126,67 @@ EXTENSION KEYS: $content.= ' ' . t3lib_BEfunc::cshItem('_MOD_tools_em', 'settings', $GLOBALS['BACK_PATH'], '|
') . '
-
Security Settings +
' . $GLOBALS['LANG']->getLL('security_settings') . ' - +
'.t3lib_BEfunc::getFuncCheck(0,'SET[display_unchecked]',$this->MOD_SETTINGS['display_unchecked'],'','','id="display_unchecked"').'
- Notice: Make sure you know what consequences enabling this checkbox might have. Check the information on typo3.org about security reviewing! -
+ ' . $GLOBALS['LANG']->getLL('notice') . ' ' . + sprintf($GLOBALS['LANG']->getLL('security_notice'), + '', '' + ) . + '


-
User Settings +
' . $GLOBALS['LANG']->getLL('user_settings') . ' - + - +
- Notice: This is not your password to the TYPO3 backend! This user information is what is needed to log in at typo3.org with your account there! + ' . $GLOBALS['LANG']->getLL('notice') . ' ' . + $GLOBALS['LANG']->getLL('repository_password_info') . '


-
Mirror selection +
' . $GLOBALS['LANG']->getLL('mirror_selection') . ' - +

-

Select a mirror from below. This list is built from the online mirror list retrieved from the URL above.

-
Mirror list'; +

' . $GLOBALS['LANG']->getLL('mirror_select') . '

+
' . $GLOBALS['LANG']->getLL('mirror_list') . ''; if(!empty($this->MOD_SETTINGS['mirrorListURL'])) { if ($this->CMD['fetchMetaData']) { // fetches mirror/extension data from online rep. $content .= $this->fetchMetaData($this->CMD['fetchMetaData']); } else { - $content.= 'Click here to reload the list.'; + $content .= '' . $GLOBALS['LANG']->getLL('mirror_list_reload') . ''; } } $content .= '
- + + + + + + + '; if (!strlen($this->MOD_SETTINGS['extMirrors'])) $this->fetchMetaData('mirrors'); $extMirrors = unserialize($this->MOD_SETTINGS['extMirrors']); - $extMirrors[''] = array('title'=>'Random (recommended!)'); + $extMirrors[''] = array('title'=>$GLOBALS['LANG']->getLL('mirror_use_random')); ksort($extMirrors); if(is_array($extMirrors)) { foreach($extMirrors as $k => $v) { @@ -1142,19 +1204,19 @@ EXTENSION KEYS:
UseNameURLCountrySponsored by
' . $GLOBALS['LANG']->getLL('mirror_use') . '' . $GLOBALS['LANG']->getLL('mirror_name') . '' . $GLOBALS['LANG']->getLL('mirror_url') . '' . $GLOBALS['LANG']->getLL('mirror_country') . '' . $GLOBALS['LANG']->getLL('mirror_sponsored_by') . '
- +
- If you set a repository URL, this overrides the use of a mirror. Use this to select a specific (private) repository.
+ ' . $GLOBALS['LANG']->getLL('repository_url_hint') . '

- + '; - $this->content.=$this->doc->section('Repository settings',$content,0,1); + $this->content .= $this->doc->section($GLOBALS['LANG']->getLL('repository_settings'), $content, 0, 1); } /** diff --git a/typo3/sysext/lang/locallang_mod_tools_em.xml b/typo3/sysext/lang/locallang_mod_tools_em.xml index a69878c06e81..92a299c25830 100755 --- a/typo3/sysext/lang/locallang_mod_tools_em.xml +++ b/typo3/sysext/lang/locallang_mod_tools_em.xml @@ -68,6 +68,58 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -- 2.20.1