Fixed bug #11296: Login-Page: function makeCopyrightNotice() uses hardcoded text
authorRupert Germann <rupi@gmx.li>
Thu, 23 Jul 2009 17:42:10 +0000 (17:42 +0000)
committerRupert Germann <rupi@gmx.li>
Thu, 23 Jul 2009 17:42:10 +0000 (17:42 +0000)
git-svn-id: https://svn.typo3.org/TYPO3v4/Core/trunk@5733 709f56b5-9817-0410-a4d7-c38de5d9e867

ChangeLog
typo3/index.php
typo3/sysext/lang/locallang_login.xml

index d59f39b..5665021 100755 (executable)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2009-07-23  Rupert Germann  <rupi@gmx.li>
+
+       * Fixed bug #11296: Login-Page: function makeCopyrightNotice() uses hardcoded text (Thanx to Christopher Stelmaszyk)
+
 2009-07-22  Steffen Kamper  <info@sk-typo3.de>
 
        * Fixed bug #11566: Missing css for grouping grid collapse/expand (ExtJS)
index 87872f7..7a1a59a 100644 (file)
@@ -466,21 +466,21 @@ class SC_index {
 
                        // Make warranty note:
                if (strlen($loginCopyrightWarrantyProvider)>=2 && strlen($loginCopyrightWarrantyURL)>=10)       {
-                       $warrantyNote='Warranty is supplied by '.htmlspecialchars($loginCopyrightWarrantyProvider).'; <a href="'.htmlspecialchars($loginCopyrightWarrantyURL).'" target="_blank">click for details.</a>';
+                       $warrantyNote = sprintf($GLOBALS['LANG']->getLL('warranty.by'), htmlspecialchars($loginCopyrightWarrantyProvider), '<a href="' . htmlspecialchars($loginCopyrightWarrantyURL) . '" target="_blank">', '</a>');
                } else {
-                       $warrantyNote='TYPO3 comes with ABSOLUTELY NO WARRANTY; <a href="http://typo3.com/1316.0.html" target="_blank">click for details.</a>';
+                       $warrantyNote = sprintf($GLOBALS['LANG']->getLL('no.warranty'), '<a href="http://typo3.com/1316.0.html" target="_blank">', '</a>');
                }
 
                        // Compile full copyright notice:
                $copyrightNotice = '<a href="http://typo3.com/" target="_blank">'.
-                                       '<img src="'.$loginImageSmall.'" alt="TYPO3 logo" align="left" />'.
-                                       'TYPO3 CMS'.($GLOBALS['TYPO3_CONF_VARS']['SYS']['loginCopyrightShowVersion']?' ver. '.htmlspecialchars($GLOBALS['TYPO_VERSION']):'').
-                                       '</a>. '.
-                                       'Copyright &copy; '.TYPO3_copyright_year.' Kasper Sk&#229;rh&#248;j. Extensions are copyright of their respective owners. '.
-                                       'Go to <a href="http://typo3.com/" target="_blank">http://typo3.com/</a> for details. '.
-                                       $warrantyNote.' '.
-                                       'This is free software, and you are welcome to redistribute it under certain conditions; <a href="http://typo3.com/1316.0.html" target="_blank">click for details</a>. '.
-                                       'Obstructing the appearance of this notice is prohibited by law.';
+                                       '<img src="' . $loginImageSmall . '" alt="' . $GLOBALS['LANG']->getLL('typo3.logo') . '" align="left" />' .
+                                       $GLOBALS['LANG']->getLL('typo3.cms') . ($GLOBALS['TYPO3_CONF_VARS']['SYS']['loginCopyrightShowVersion']?' ' . $GLOBALS['LANG']->getLL('version.short') . ' ' . htmlspecialchars($GLOBALS['TYPO_VERSION']):'') .
+                                       '</a>. ' .
+                                       $GLOBALS['LANG']->getLL('copyright') . ' &copy; ' . TYPO3_copyright_year . ' Kasper Sk&#229;rh&#248;j. ' . $GLOBALS['LANG']->getLL('extension.copyright') . ' ' .
+                                       sprintf($GLOBALS['LANG']->getLL('details.link'), '<a href="http://typo3.com/" target="_blank">http://typo3.com/</a>') . ' ' .
+                                       $warrantyNote . ' ' .
+                                       sprintf($GLOBALS['LANG']->getLL('free.software'), '<a href="http://typo3.com/1316.0.html" target="_blank">', '</a> ') .
+                                       $GLOBALS['LANG']->getLL('keep.notice');
 
                        // Return notice:
                return $copyrightNotice;
index 8c7811e..f173adb 100644 (file)
                        <label index="newsheadline">Important Messages:</label>
                        <label index="error.login">Your login attempt did not succeed. Make sure to spell your username and password correctly, including upper/lowercase characters.</label>
                        <label index="error.javascript">Activate JavaScript, please!</label>
+                       <label index="warranty.by">Warranty is supplied by %s; %sclick for details.%s</label>
+                       <label index="no.warranty">TYPO3 comes with ABSOLUTELY NO WARRANTY; %sclick for details.%s</label>
+                       <label index="typo3.logo">TYPO3 logo</label>
+                       <label index="typo3.cms">TYPO3 CMS</label>
+                       <label index="version.short">ver.</label>
+                       <label index="copyright">Copyright</label>
+                       <label index="extension.copyright">Extensions are copyright of their respective owners.</label>
+                       <label index="details.link">Go to %s for details.</label>
+                       <label index="free.software">This is free software, and you are welcome to redistribute it under certain conditions; %sclick for details.%s</label>
+                       <label index="keep.notice">Obstructing the appearance of this notice is prohibited by law.</label>
                </languageKey>
        </data>
 </T3locallang>
\ No newline at end of file