From: Christian Kuhn Date: Fri, 31 Jul 2009 09:56:11 +0000 (+0000) Subject: Fixed bug #11601: Copyright-Notice is hardcoded (Thanks to Christopher Stelmaszyk) X-Git-Tag: TYPO3_4-3-0beta1~318 X-Git-Url: http://git.typo3.org/Packages/TYPO3.CMS.git/commitdiff_plain/c97e5311611b43064162efc53d10f7a121c2bb62?hp=3dc863868f958789422b33de7ab547093de72d01 Fixed bug #11601: Copyright-Notice is hardcoded (Thanks to Christopher Stelmaszyk) git-svn-id: https://svn.typo3.org/TYPO3v4/Core/trunk@5741 709f56b5-9817-0410-a4d7-c38de5d9e867 --- diff --git a/ChangeLog b/ChangeLog index 1c1699a4667c..d41f3e8dbc75 100755 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2009-07-31 Christian Kuhn + + * Fixed bug #11601: Copyright-Notice is hardcoded (Thanks to Christopher Stelmaszyk) + 2009-07-30 Oliver Hader * Cleanup: Fixed ChangeLog and moved information concerning database updates to NEWS.txt diff --git a/t3lib/class.t3lib_befunc.php b/t3lib/class.t3lib_befunc.php index 75d110b142b4..2bbce8e0344d 100644 --- a/t3lib/class.t3lib_befunc.php +++ b/t3lib/class.t3lib_befunc.php @@ -3961,12 +3961,32 @@ final class t3lib_BEfunc { $loginCopyrightWarrantyURL = strip_tags(trim($TYPO3_CONF_VARS['SYS']['loginCopyrightWarrantyURL'])); if (strlen($loginCopyrightWarrantyProvider)>=2 && strlen($loginCopyrightWarrantyURL)>=10) { - $warrantyNote = 'Warranty is supplied by '.htmlspecialchars($loginCopyrightWarrantyProvider).'; click for details.'; + $warrantyNote = sprintf($GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_login.xml:warranty.by'), + htmlspecialchars($loginCopyrightWarrantyProvider), + '', '' + ); } else { - $warrantyNote = 'TYPO3 comes with ABSOLUTELY NO WARRANTY; click for details.'; + $warrantyNote = sprintf($GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_login.xml:no.warranty'), + '', '' + ); } - $cNotice = 'TYPO3 logoTYPO3 CMS ver. '.htmlspecialchars(TYPO3_version).'. Copyright © '.htmlspecialchars(TYPO3_copyright_year).' Kasper Skårhøj. Extensions are copyright of their respective owners. Go to http://typo3.com/ for details. - '.strip_tags($warrantyNote, '').' This is free software, and you are welcome to redistribute it under certain conditions; click for details. Obstructing the appearance of this notice is prohibited by law.'; + $cNotice = '' . + '' .
+			$GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_login.xml:typo3.logo') . '' . + $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_login.xml:typo3.cms') . ' ' . + $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_login.xml:version.short') . ' ' . + htmlspecialchars(TYPO3_version) . '. ' . + $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_login.xml:copyright') . ' © ' . + htmlspecialchars(TYPO3_copyright_year) . ' Kasper Skårhøj. ' . + $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_login.xml:extension.copyright') . ' ' . + sprintf($GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_login.xml:details.link'), + 'http://typo3.com/' + ) . ' ' . + strip_tags($warrantyNote, '') . ' ' . + sprintf($GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_login.xml:free.software'), + '', ' ' + ) . + $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_login.xml:keep.notice'); return $cNotice; }