[TYPO3-core] RFC #11601: Copyright-Notice is hardcoded
Christopher Stelmaszyk
christopher at yahoo.de
Thu Jul 30 12:13:58 CEST 2009
Hi!
This is a SVN patch request.
Type: feature
Branches: trunk
BT reference:
http://bugs.typo3.org/view.php?id=11601
Problem:
In the About-modules-module the copyright-notice is hardcoded.
Concerning the text which is localized this is the same as #11296.
Solution:
Use language-labels to fix that. All labels needed have already been
committed with #11296.
Kind regards
Christopher
Index: t3lib/class.t3lib_befunc.php
===================================================================
--- t3lib/class.t3lib_befunc.php (revision 5734)
+++ t3lib/class.t3lib_befunc.php (working copy)
@@ -3961,12 +3961,32 @@
$loginCopyrightWarrantyURL =
strip_tags(trim($TYPO3_CONF_VARS['SYS']['loginCopyrightWarrantyURL']));
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']->sL('LLL:EXT:lang/locallang_login.xml: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']->sL('LLL:EXT:lang/locallang_login.xml:no.warranty'),
+ '<a href="http://typo3.com/1316.0.html" target="_blank">', '</a>'
+ );
}
- $cNotice = '<a href="http://typo3.com/" target="_blank"><img
src="gfx/loginlogo_transp.gif" width="75" vspace="2" hspace="4" height="19"
alt="TYPO3 logo" align="left" />TYPO3 CMS ver.
'.htmlspecialchars(TYPO3_version).'</a>. Copyright ©
'.htmlspecialchars(TYPO3_copyright_year).' Kasper Skårhøj.
Extensions are copyright of their respective owners. Go to <a
href="http://typo3.com/" target="_blank">http://typo3.com/</a> for details.
- '.strip_tags($warrantyNote, '<a>').' 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.';
+ $cNotice = '<a href="http://typo3.com/" target="_blank">' .
+ '<img src="gfx/loginlogo_transp.gif" width="75" vspace="2" hspace="4"
height="19" alt="' .
+ $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_login.xml:typo3.logo') . '"
align="left" />' .
+ $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) . '</a>. ' .
+ $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'),
+ '<a href="http://typo3.com/" target="_blank">http://typo3.com/</a>'
+ ) . ' ' .
+ strip_tags($warrantyNote, '<a>') . ' ' .
+
sprintf($GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_login.xml:free.software'),
+ '<a href="http://typo3.com/1316.0.html" target="_blank">', '</a> '
+ ) .
+ $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_login.xml:keep.notice');
return $cNotice;
}
begin 666 11601_copyright-notice.patch
M26YD97 at Z('0S;&EB+V-L87-S+G0S;&EB7V)E9G5N8RYP:' -"CT]/3T]/3T]
M/3T]/3T]/3T]/3T]/3T]/3T]/3T]/3T]/3T]/3T]/3T]/3T]/3T]/3T]/3T]
M/3T]/3T]/3T]/3T]/3T-"BTM+2!T,VQI8B]C;&%S<RYT,VQI8E]B969U;F,N
M<&AP"2AR979I<VEO;B U-S,T*0T**RLK('0S;&EB+V-L87-S+G0S;&EB7V)E
M9G5N8RYP:' )*'=O<FMI;F<@8V]P>2D-"D! ("TS.38Q+#$R("LS.38Q+#,R
M($! #0H@"0DD;&]G:6Y#;W!Y<FEG:'1787)R86YT>5523" ]('-T<FEP7W1A
M9W,H=')I;2 at D5%E03S-?0T].1E]605)36R=365,G75LG;&]G:6Y#;W!Y<FEG
M:'1787)R86YT>5523"==*2D["B *( D):68@*'-T<FQE;B at D;&]G:6Y#;W!Y
M<FEG:'1787)R86YT>5!R;W9I9&5R*3X],B F)B!S=')L96XH)&QO9VEN0V]P
M>7)I9VAT5V%R<F%N='E54DPI/CTQ,"D@>PHM"0D))'=A<G)A;G1Y3F]T92 ]
M("=787)R86YT>2!I<R!S=7!P;&EE9"!B>2 G+FAT;6QS<&5C:6%L8VAA<G,H
M)&QO9VEN0V]P>7)I9VAT5V%R<F%N='E0<F]V:61E<BDN)SL@/&$@:')E9CTB
M)RYH=&UL<W!E8VEA;&-H87)S*"1L;V=I;D-O<'ER:6=H=%=A<G)A;G1Y55),
M*2XG(B!T87)G970](E]B;&%N:R(^8VQI8VL at 9F]R(&1E=&%I;',N/"]A/B<[
M"BL)"0DD=V%R<F%N='E.;W1E(#T@<W!R:6YT9B at D1TQ/0D%,4ULG3$%.1R==
M+3YS3"@G3$Q,.D585#IL86YG+VQO8V%L;&%N9U]L;V=I;BYX;6PZ=V%R<F%N
M='DN8GDG*2P**PD)"0EH=&UL<W!E8VEA;&-H87)S*"1L;V=I;D-O<'ER:6=H
M=%=A<G)A;G1Y4')O=FED97(I+ HK"0D)"2<\82!H<F5F/2(G("X@:'1M;'-P
M96-I86QC:&%R<R at D;&]G:6Y#;W!Y<FEG:'1787)R86YT>5523"D at +B G(B!T
M87)G970](E]B;&%N:R(^)RP@)SPO83XG"BL)"0DI.PH@"0E](&5L<V4@>PHM
M"0D))'=A<G)A;G1Y3F]T92 ]("=465!/,R!C;VUE<R!W:71H($%"4T],551%
M3%D at 3D\@5T%24D%.5%D[(#QA(&AR968](FAT=' Z+R]T>7!O,RYC;VTO,3,Q
M-BXP+FAT;6PB('1A<F=E=#TB7V)L86YK(CYC;&EC:R!F;W(@9&5T86EL<RX\
M+V$^)SL**PD)"21W87)R86YT>4YO=&4@/2!S<')I;G1F*"1'3$]"04Q36R=,
M04Y')UTM/G-,*"=,3$PZ15A4.FQA;F<O;&]C86QL86YG7VQO9VEN+GAM;#IN
M;RYW87)R86YT>2<I+ HK"0D)"2<\82!H<F5F/2)H='1P.B\O='EP;S,N8V]M
M+S$S,38N,"YH=&UL(B!T87)G970](E]B;&%N:R(^)RP@)SPO83XG"BL)"0DI
M.PH@"0E]"BT)"21C3F]T:6-E(#T@)SQA(&AR968](FAT=' Z+R]T>7!O,RYC
M;VTO(B!T87)G970](E]B;&%N:R(^/&EM9R!S<F,](F=F>"]L;V=I;FQO9V]?
M=')A;G-P+F=I9B(@=VED=&@](C<U(B!V<W!A8V4](C(B(&AS<&%C93TB-"(@
M:&5I9VAT/2(Q.2(@86QT/2)465!/,R!L;V=O(B!A;&EG;CTB;&5F="(@+SY4
M65!/,R!#35,@=F5R+B G+FAT;6QS<&5C:6%L8VAA<G,H5%E03S-?=F5R<VEO
M;BDN)SPO83XN($-O<'ER:6=H=" F8V]P>3L@)RYH=&UL<W!E8VEA;&-H87)S
M*%194$\S7V-O<'ER:6=H=%]Y96%R*2XG($MA<W!E<B!3:R9A<FEN9SMR:"9O
M<VQA<V@[:BX at 17AT96YS:6]N<R!A<F4 at 8V]P>7)I9VAT(&]F('1H96ER(')E
M<W!E8W1I=F4@;W=N97)S+B!';R!T;R \82!H<F5F/2)H='1P.B\O='EP;S,N
M8V]M+R(@=&%R9V5T/2)?8FQA;FLB/FAT=' Z+R]T>7!O,RYC;VTO/"]A/B!F
M;W(@9&5T86EL<RX*+0D))RYS=')I<%]T86=S*"1W87)R86YT>4YO=&4L("<\
M83XG*2XG(%1H:7,@:7, at 9G)E92!S;V9T=V%R92P at 86YD('EO=2!A<F4@=V5L
M8V]M92!T;R!R961I<W1R:6)U=&4@:70@=6YD97(@8V5R=&%I;B!C;VYD:71I
M;VYS.R \82!H<F5F/2)H='1P.B\O='EP;S,N8V]M+S$S,38N,"YH=&UL(B!T
M87)G970](E]B;&%N:R(^8VQI8VL at 9F]R(&1E=&%I;',\+V$^+B!/8G-T<G5C
M=&EN9R!T:&4 at 87!P96%R86YC92!O9B!T:&ES(&YO=&EC92!I<R!P<F]H:6)I
M=&5D(&)Y(&QA=RXG.PHK"0DD8TYO=&EC92 ]("<\82!H<F5F/2)H='1P.B\O
M='EP;S,N8V]M+R(@=&%R9V5T/2)?8FQA;FLB/B<@+ at HK"0D))SQI;6<@<W)C
M/2)G9G at O;&]G:6YL;V=O7W1R86YS<"YG:68B('=I9'1H/2(W-2(@=G-P86-E
M/2(R(B!H<W!A8V4](C0B(&AE:6=H=#TB,3DB(&%L=#TB)R N"BL)"0DD1TQ/
M0D%,4ULG3$%.1R==+3YS3"@G3$Q,.D585#IL86YG+VQO8V%L;&%N9U]L;V=I
M;BYX;6PZ='EP;S,N;&]G;R<I("X@)R(@86QI9VX](FQE9G0B("\^)R N"BL)
M"0DD1TQ/0D%,4ULG3$%.1R==+3YS3"@G3$Q,.D585#IL86YG+VQO8V%L;&%N
M9U]L;V=I;BYX;6PZ='EP;S,N8VUS)RD at +B G("<@+ at HK"0D))$=,3T)!3%-;
M)TQ!3D<G72T^<TPH)TQ,3#I%6%0Z;&%N9R]L;V-A;&QA;F=?;&]G:6XN>&UL
M.G9E<G-I;VXN<VAO<G0G*2 N("<@)R N"BL)"0EH=&UL<W!E8VEA;&-H87)S
M*%194$\S7W9E<G-I;VXI("X@)SPO83XN("<@+ at HK"0D))$=,3T)!3%-;)TQ!
M3D<G72T^<TPH)TQ,3#I%6%0Z;&%N9R]L;V-A;&QA;F=?;&]G:6XN>&UL.F-O
M<'ER:6=H="<I("X@)R F8V]P>3L@)R N"BL)"0EH=&UL<W!E8VEA;&-H87)S
M*%194$\S7V-O<'ER:6=H=%]Y96%R*2 N("<@2V%S<&5R(%-K)F%R:6YG.W)H
M)F]S;&%S:#MJ+B G("X**PD)"21'3$]"04Q36R=,04Y')UTM/G-,*"=,3$PZ
M15A4.FQA;F<O;&]C86QL86YG7VQO9VEN+GAM;#IE>'1E;G-I;VXN8V]P>7)I
M9VAT)RD at +B G("<@+ at HK"0D)<W!R:6YT9B at D1TQ/0D%,4ULG3$%.1R==+3YS
M3"@G3$Q,.D585#IL86YG+VQO8V%L;&%N9U]L;V=I;BYX;6PZ9&5T86EL<RYL
M:6YK)RDL"BL)"0D))SQA(&AR968](FAT=' Z+R]T>7!O,RYC;VTO(B!T87)G
M970](E]B;&%N:R(^:'1T<#HO+W1Y<&\S+F-O;2\\+V$^)PHK"0D)*2 N("<@
M)R N"BL)"0ES=')I<%]T86=S*"1W87)R86YT>4YO=&4L("<\83XG*2 N("<@
M)R N"BL)"0ES<')I;G1F*"1'3$]"04Q36R=,04Y')UTM/G-,*"=,3$PZ15A4
M.FQA;F<O;&]C86QL86YG7VQO9VEN+GAM;#IF<F5E+G-O9G1W87)E)RDL"BL)
M"0D))SQA(&AR968](FAT=' Z+R]T>7!O,RYC;VTO,3,Q-BXP+FAT;6PB('1A
M<F=E=#TB7V)L86YK(CXG+" G/"]A/B G"BL)"0DI("X**PD)"21'3$]"04Q3
M6R=,04Y')UTM/G-,*"=,3$PZ15A4.FQA;F<O;&]C86QL86YG7VQO9VEN+GAM
K;#IK965P+FYO=&EC92<I.PH@"B )"7)E='5R;B D8TYO=&EC93L*( E]"@``
`
end
More information about the TYPO3-team-core
mailing list