Index: typo3/sysext/reports/reports/status/class.tx_reports_reports_status_configurationstatus.php
===================================================================
--- typo3/sysext/reports/reports/status/class.tx_reports_reports_status_configurationstatus.php (revision 6310)
+++ typo3/sysext/reports/reports/status/class.tx_reports_reports_status_configurationstatus.php (working copy)
@@ -75,7 +75,7 @@
}
return t3lib_div::makeInstance('tx_reports_reports_status_Status',
- 'Reference Index', $value, $message, $severity
+ $GLOBALS['LANG']->getLL('status_referenceIndex'), $value, $message, $severity
);
}
@@ -171,7 +171,7 @@
}
return t3lib_div::makeInstance('tx_reports_reports_status_Status',
- 'Memcached Configuration', $value, $message, $severity
+ $GLOBALS['LANG']->getLL('status_memcachedConfiguration'), $value, $message, $severity
);
}
Index: typo3/sysext/reports/reports/status/class.tx_reports_reports_status_securitystatus.php
===================================================================
--- typo3/sysext/reports/reports/status/class.tx_reports_reports_status_securitystatus.php (revision 6310)
+++ typo3/sysext/reports/reports/status/class.tx_reports_reports_status_securitystatus.php (working copy)
@@ -84,7 +84,7 @@
$GLOBALS['TYPO3_DB']->sql_free_result($res);
return t3lib_div::makeInstance('tx_reports_reports_status_Status',
- 'Admin User Account', $value, $message, $severity
+ $GLOBALS['LANG']->getLL('status_adminUserAccount'), $value, $message, $severity
);
}
@@ -113,7 +113,7 @@
}
return t3lib_div::makeInstance('tx_reports_reports_status_Status',
- 'Encryption Key', $value, $message, $severity
+ $GLOBALS['LANG']->getLL('status_encryptionKey'), $value, $message, $severity
);
}
@@ -143,7 +143,7 @@
}
return t3lib_div::makeInstance('tx_reports_reports_status_Status',
- 'File Deny Pattern', $value, $message, $severity
+ $GLOBALS['LANG']->getLL('status_fileDenyPattern'), $value, $message, $severity
);
}
@@ -165,7 +165,7 @@
}
return t3lib_div::makeInstance('tx_reports_reports_status_Status',
- '.htaccess Upload Protection', $value, $message, $severity
+ $GLOBALS['LANG']->getLL('status_htaccessUploadProtection'), $value, $message, $severity
);
}
@@ -226,7 +226,7 @@
}
return t3lib_div::makeInstance('tx_reports_reports_status_Status',
- 'Install Tool Password', $value, $message, $severity
+ $GLOBALS['LANG']->getLL('status_installToolPassword'), $value, $message, $severity
);
}
@@ -261,7 +261,7 @@
}
return t3lib_div::makeInstance('tx_reports_reports_status_Status',
- 'Install Tool', $value, $message, $severity
+ $GLOBALS['LANG']->getLL('status_installTool'), $value, $message, $severity
);
}
Index: typo3/sysext/reports/reports/status/class.tx_reports_reports_status_systemstatus.php
===================================================================
--- typo3/sysext/reports/reports/status/class.tx_reports_reports_status_systemstatus.php (revision 6310)
+++ typo3/sysext/reports/reports/status/class.tx_reports_reports_status_systemstatus.php (working copy)
@@ -59,12 +59,12 @@
$severity = tx_reports_reports_status_Status::OK;
if (version_compare(phpversion(), TYPO3_REQUIREMENTS_MINIMUM_PHP) < 0) {
- $message = 'Your PHP installation is too old.';
+ $message = $GLOBALS['LANG']->getLL('status_phpTooOld');
$severity = tx_reports_reports_status_Status::ERROR;
}
return t3lib_div::makeInstance('tx_reports_reports_status_Status',
- 'PHP',
+ $GLOBALS['LANG']->getLL('status_phpVersion'),
phpversion(),
$message,
$severity
@@ -82,25 +82,25 @@
$severity = tx_reports_reports_status_Status::OK;
if ($memoryLimit && t3lib_div::getBytesFromSizeMeasurement($memoryLimit) < t3lib_div::getBytesFromSizeMeasurement(TYPO3_REQUIREMENTS_RECOMMENDED_PHP_MEMORY_LIMIT)) {
- $message = 'Depending on your configuration, TYPO3 can run with a ' . $memoryLimit . ' PHP memory limit. However, a ' . TYPO3_REQUIREMENTS_RECOMMENDED_PHP_MEMORY_LIMIT . ' PHP memory limit or above is recommended, especially if your site uses additional extensions.';
+ $message = sprintf($GLOBALS['LANG']->getLL('status_phpMemoryRecommendation'), $memoryLimit, TYPO3_REQUIREMENTS_RECOMMENDED_PHP_MEMORY_LIMIT);
$severity = tx_reports_reports_status_Status::WARNING;
}
if ($memoryLimit && t3lib_div::getBytesFromSizeMeasurement($memoryLimit) < t3lib_div::getBytesFromSizeMeasurement(TYPO3_REQUIREMENTS_MINIMUM_PHP_MEMORY_LIMIT)) {
- $message = 'Depending on your configuration, TYPO3 can run with a ' . $memoryLimit . ' PHP memory limit. However, a ' . TYPO3_REQUIREMENTS_MINIMUM_PHP_MEMORY_LIMIT . ' PHP memory limit or above is required, especially if your site uses additional extensions.';
+ $message = sprintf($GLOBALS['LANG']->getLL('status_phpMemoryRequirement'), $memoryLimit, TYPO3_REQUIREMENTS_MINIMUM_PHP_MEMORY_LIMIT);
$severity = tx_reports_reports_status_Status::ERROR;
}
if ($severity > tx_reports_reports_status_Status::OK) {
if ($php_ini_path = get_cfg_var('cfg_file_path')) {
- $message .= ' Increase the memory limit by editing the memory_limit parameter in the file ' . $php_ini_path . ' and then restart your web server (or contact your system administrator or hosting provider for assistance).';
+ $message .= ' ' . sprintf($GLOBALS['LANG']->getLL('status_phpMemoryEditLimit'), $php_ini_path);
} else {
- $message .= ' Contact your system administrator or hosting provider for assistance with increasing your PHP memory limit.';
+ $message .= ' ' . $GLOBALS['LANG']->getLL('status_phpMemoryContactAdmin');
}
}
return t3lib_div::makeInstance('tx_reports_reports_status_Status',
- 'PHP Memory Limit', $memoryLimit, $message, $severity
+ $GLOBALS['LANG']->getLL('status_phpMemory'), $memoryLimit, $message, $severity
);
}
@@ -118,14 +118,18 @@
// can't reliably check for 'on', therefore checking for the oposite 'off', '', or 0
if (!empty($registerGlobals) && strtolower($registerGlobals) != 'off') {
- $message = 'register_globals is enabled. TYPO3 requires this configuration directive to be disabled. Your site may not be secure when register_globals is enabled. The PHP manual has instructions for how to change configuration settings.';
+ $registerGlobalsHighlight = 'register_globals';
+ $phpManualLink .= '' . $GLOBALS['LANG']->getLL('status_phpRegisterGlobalsHowToChange') . '';
+ $message = sprintf($GLOBALS['LANG']->getLL('status_phpRegisterGlobalsEnabled'), $registerGlobalsHighlight);
+ $message .= ' ' . sprintf($GLOBALS['LANG']->getLL('status_phpRegisterGlobalsSecurity'), $registerGlobalsHighlight);
+ $message .= ' ' . sprintf($GLOBALS['LANG']->getLL('status_phpRegisterGlobalsPHPManual'), $phpManualLink);
$severity = tx_reports_reports_status_Status::ERROR;
$value = $GLOBALS['LANG']->getLL('status_enabled')
. ' (\'' . $registerGlobals . '\')';
}
return t3lib_div::makeInstance('tx_reports_reports_status_Status',
- 'PHP Register Globals', $value, $message, $severity
+ $GLOBALS['LANG']->getLL('status_phpRegisterGlobals'), $value, $message, $severity
);
}
@@ -136,7 +140,7 @@
*/
protected function getWebserverStatus() {
return t3lib_div::makeInstance('tx_reports_reports_status_Status',
- 'Web Server',
+ $GLOBALS['LANG']->getLL('status_webServer'),
$_SERVER['SERVER_SOFTWARE']
);
}
Index: typo3/sysext/reports/reports/class.tx_reports_reports_status.php
===================================================================
--- typo3/sysext/reports/reports/class.tx_reports_reports_status.php (revision 6310)
+++ typo3/sysext/reports/reports/class.tx_reports_reports_status.php (working copy)
@@ -157,10 +157,10 @@
*/
protected function sortStatusProviders(array $statusCollection) {
$systemStatus = array(
- 'TYPO3 System' => $statusCollection['Installation'],
- 'System' => $statusCollection['System'],
- 'Security' => $statusCollection['security'],
- 'Configuration' => $statusCollection['configuration'],
+ $GLOBALS['LANG']->getLL('status_typo3_system') => $statusCollection['Installation'],
+ $GLOBALS['LANG']->getLL('status_system') => $statusCollection['System'],
+ $GLOBALS['LANG']->getLL('status_security') => $statusCollection['security'],
+ $GLOBALS['LANG']->getLL('status_configuration') => $statusCollection['configuration'],
);
unset(
$statusCollection['Installation'],
Index: typo3/sysext/reports/reports/locallang.xml
===================================================================
--- typo3/sysext/reports/reports/locallang.xml (revision 6310)
+++ typo3/sysext/reports/reports/locallang.xml (working copy)
@@ -2,13 +2,16 @@
module
- Language labels for module 'tools_txreportsM1'
+ Language labels for the status reports
+
+
+
@@ -17,8 +20,28 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
Index: typo3/sysext/install/report/class.tx_install_report_installstatus.php
===================================================================
--- typo3/sysext/install/report/class.tx_install_report_installstatus.php (revision 6310)
+++ typo3/sysext/install/report/class.tx_install_report_installstatus.php (working copy)
@@ -73,7 +73,7 @@
* @return unknown_type
*/
protected function getFileSystemStatus() {
- $value = 'Writable';
+ $value = $GLOBALS['LANG']->sL('LLL:EXT:install/report/locallang.xml:status_writable');
$message = '';
$severity = tx_reports_reports_status_Status::OK;
@@ -112,18 +112,18 @@
if (!@is_dir(PATH_site . $relPath)) {
if ($requirementLevel > 0) {
// directory is required
- $value = 'Required Directory Missing';
- $message .= $relPath . ' does not exist and could not be created.
';
+ $value = $GLOBALS['LANG']->sL('LLL:EXT:install/report/locallang.xml:status_missingDirectory');
+ $message .= sprintf($GLOBALS['LANG']->sL('LLL:EXT:install/report/locallang.xml:status_directoryDoesNotExistCouldNotCreate'), $relPath) . '
';
$severity = tx_reports_reports_status_Status::ERROR;
} else {
+ $message .= sprintf($GLOBALS['LANG']->sL('LLL:EXT:install/report/locallang.xml:status_directoryDoesNotExist'), $relPath);
if ($requirementLevel == 0) {
- $message .= $relPath . ' does not exist but should be writable if it does exist.
';
- } else {
- $message .= $relPath . ' does not exist.
';
+ $message .= ' ' . $GLOBALS['LANG']->sL('LLL:EXT:install/report/locallang.xml:status_directoryShouldAlsoBeWritable');
}
+ $message .= '
';
if ($severity < tx_reports_reports_status_Status::WARNING) {
- $value = 'Directory not existing';
+ $value = $GLOBALS['LANG']->sL('LLL:EXT:install/report/locallang.xml:status_nonExistingDirectory');
$severity = tx_reports_reports_status_Status::WARNING;
}
}
@@ -131,16 +131,16 @@
if (!is_writable(PATH_site . $relPath)) {
switch ($requirementLevel) {
case 0:
- $message .= PATH_site . $relPath . ' should be writable.
';
+ $message .= sprintf($GLOBALS['LANG']->sL('LLL:EXT:install/report/locallang.xml:status_directoryShouldBeWritable'), PATH_site . $relPath) . '
';
if ($severity < tx_reports_reports_status_Status::WARNING) {
- $value = 'Directory should be writable';
+ $value = $GLOBALS['LANG']->sL('LLL:EXT:install/report/locallang.xml:status_recommendedWritableDirectory');
$severity = tx_reports_reports_status_Status::WARNING;
}
break;
case 2:
- $value = 'Directory not writable';
- $message .= PATH_site . $relPath . ' must be writable.
';
+ $value = $GLOBALS['LANG']->sL('LLL:EXT:install/report/locallang.xml:status_requiredWritableDirectory');
+ $message .= sprintf($GLOBALS['LANG']->sL('LLL:EXT:install/report/locallang.xml:status_directoryMustBeWritable'), PATH_site . $relPath) . '
';
$severity = tx_reports_reports_status_Status::ERROR;
break;
}
@@ -149,7 +149,7 @@
}
return t3lib_div::makeInstance('tx_reports_reports_status_Status',
- 'File System',
+ $GLOBALS['LANG']->sL('LLL:EXT:install/report/locallang.xml:status_fileSystem'),
$value,
$message,
$severity
@@ -180,7 +180,7 @@
}
return t3lib_div::makeInstance('tx_reports_reports_status_Status',
- 'Remaining Updates', $value, $message, $severity
+ $GLOBALS['LANG']->sL('LLL:EXT:install/report/locallang.xml:status_remainingUpdates'), $value, $message, $severity
);
}
Index: typo3/sysext/install/report/locallang.xml
===================================================================
--- typo3/sysext/install/report/locallang.xml (revision 0)
+++ typo3/sysext/install/report/locallang.xml (revision 0)
@@ -0,0 +1,23 @@
+
+
+
+ module
+ Language labels for the Install Tool status reports
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file