[TYPO3-core] RFC #11296: Log In-page uses hardcoded labels
Christopher Stelmaszyk
christopher at yahoo.de
Mon Jun 29 21:16:27 CEST 2009
Hi!
This is a SVN patch request.
Type: feature
Branches: trunk
BT reference:
http://bugs.typo3.org/view.php?id=11296
Problem:
The copyright-notice on the Log In-page is not translatable.
Solution:
Use language-labels to fix that.
Kind regards
Christopher
Index: typo3/sysext/lang/locallang_login.xml
===================================================================
--- typo3/sysext/lang/locallang_login.xml (revision 5651)
+++ typo3/sysext/lang/locallang_login.xml (working copy)
@@ -18,6 +18,16 @@
<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
Index: typo3/index.php
===================================================================
--- typo3/index.php (revision 5651)
+++ typo3/index.php (working copy)
@@ -466,21 +466,21 @@
// 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 © '.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. '.
- $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') . ' © ' .
TYPO3_copyright_year . ' Kasper Skårhø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;
begin 666 11296.patch
M26YD97 at Z('1Y<&\S+W-Y<V5X="]L86YG+VQO8V%L;&%N9U]L;V=I;BYX;6P-
M"CT]/3T]/3T]/3T]/3T]/3T]/3T]/3T]/3T]/3T]/3T]/3T]/3T]/3T]/3T]
M/3T]/3T]/3T]/3T]/3T]/3T]/3T]/3T-"BTM+2!T>7!O,R]S>7-E>'0O;&%N
M9R]L;V-A;&QA;F=?;&]G:6XN>&UL"2AR979I<VEO;B U-C4Q*0T**RLK('1Y
M<&\S+W-Y<V5X="]L86YG+VQO8V%L;&%N9U]L;V=I;BYX;6P)*'=O<FMI;F<@
M8V]P>2D-"D! ("TQ."PV("LQ."PQ-B! 0 T*( D)"3QL86)E;"!I;F1E>#TB
M;F5W<VAE861L:6YE(CY);7!O<G1A;G0 at 365S<V%G97,Z/"]L86)E;#X*( D)
M"3QL86)E;"!I;F1E>#TB97)R;W(N;&]G:6XB/EEO=7(@;&]G:6X at 871T96UP
M="!D:60@;F]T('-U8V-E960N($UA:V4@<W5R92!T;R!S<&5L;"!Y;W5R('5S
M97)N86UE(&%N9"!P87-S=V]R9"!C;W)R96-T;'DL(&EN8VQU9&EN9R!U<'!E
M<B]L;W=E<F-A<V4 at 8VAA<F%C=&5R<RX\+VQA8F5L/@H@"0D)/&QA8F5L(&EN
M9&5X/2)E<G)O<BYJ879A<V-R:7!T(CY!8W1I=F%T92!*879A4V-R:7!T+"!P
M;&5A<V4A/"]L86)E;#X**PD)"3QL86)E;"!I;F1E>#TB=V%R<F%N='DN8GDB
M/E=A<G)A;G1Y(&ES('-U<'!L:65D(&)Y("5S.R E<V-L:6-K(&9O<B!D971A
M:6QS+B5S/"]L86)E;#X**PD)"3QL86)E;"!I;F1E>#TB;F\N=V%R<F%N='DB
M/E194$\S(&-O;65S('=I=&@@04)33TQ55$5,62!.3R!705)204Y463L@)7-C
M;&EC:R!F;W(@9&5T86EL<RXE<SPO;&%B96P^"BL)"0D\;&%B96P@:6YD97@]
M(G1Y<&\S+FQO9V\B/E194$\S(&QO9V\\+VQA8F5L/@HK"0D)/&QA8F5L(&EN
M9&5X/2)T>7!O,RYC;7,B/E194$\S($--4SPO;&%B96P^"BL)"0D\;&%B96P@
M:6YD97@](G9E<G-I;VXN<VAO<G0B/G9E<BX\+VQA8F5L/@HK"0D)/&QA8F5L
M(&EN9&5X/2)C;W!Y<FEG:'0B/D-O<'ER:6=H=#PO;&%B96P^"BL)"0D\;&%B
M96P@:6YD97@](F5X=&5N<VEO;BYC;W!Y<FEG:'0B/D5X=&5N<VEO;G, at 87)E
M(&-O<'ER:6=H="!O9B!T:&5I<B!R97-P96-T:79E(&]W;F5R<RX\+VQA8F5L
M/@HK"0D)/&QA8F5L(&EN9&5X/2)D971A:6QS+FQI;FLB/D=O('1O("5S(&9O
M<B!D971A:6QS+CPO;&%B96P^"BL)"0D\;&%B96P@:6YD97@](F9R964N<V]F
M='=A<F4B/E1H: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 E<V-L:6-K(&9O<B!D971A:6QS+B5S/"]L86)E;#X**PD)"3QL86)E
M;"!I;F1E>#TB:V5E<"YN;W1I8V4B/D]B<W1R=6-T:6YG('1H92!A<'!E87)A
M;F-E(&]F('1H:7,@;F]T:6-E(&ES('!R;VAI8FET960 at 8GD@;&%W+CPO;&%B
M96P^"B )"3PO;&%N9W5A9V5+97D^"B )/"]D871A/@H@/"]4,VQO8V%L;&%N
M9SX-"EP at 3F\@;F5W;&EN92!A="!E;F0@;V8 at 9FEL90T*26YD97 at Z('1Y<&\S
M+VEN9&5X+G!H< T*/3T]/3T]/3T]/3T]/3T]/3T]/3T]/3T]/3T]/3T]/3T]
M/3T]/3T]/3T]/3T]/3T]/3T]/3T]/3T]/3T]/3T]/3T]/0T*+2TM('1Y<&\S
M+VEN9&5X+G!H< DH<F5V:7-I;VX at -38U,2D-"BLK*R!T>7!O,R]I;F1E>"YP
M:' )*'=O<FMI;F<@8V]P>2D-"D! ("TT-C8L,C$@*S0V-BPR,2! 0 T*( H@
M"0D)+R\@36%K92!W87)R86YT>2!N;W1E. at H@"0EI9B H<W1R;&5N*"1L;V=I
M;D-O<'ER:6=H=%=A<G)A;G1Y4')O=FED97(I/CTR("8F('-T<FQE;B at D;&]G
M:6Y#;W!Y<FEG:'1787)R86YT>5523"D^/3$P*0E["BT)"0DD=V%R<F%N='E.
M;W1E/2=787)R86YT>2!I<R!S=7!P;&EE9"!B>2 G+FAT;6QS<&5C:6%L8VAA
M<G,H)&QO9VEN0V]P>7)I9VAT5V%R<F%N='E0<F]V:61E<BDN)SL@/&$@:')E
M9CTB)RYH=&UL<W!E8VEA;&-H87)S*"1L;V=I;D-O<'ER:6=H=%=A<G)A;G1Y
M55),*2XG(B!T87)G970](E]B;&%N:R(^8VQI8VL at 9F]R(&1E=&%I;',N/"]A
M/B<["BL)"0DD=V%R<F%N='E.;W1E(#T@<W!R:6YT9B at D1TQ/0D%,4ULG3$%.
M1R==+3YG971,3"@G=V%R<F%N='DN8GDG*2P@:'1M;'-P96-I86QC:&%R<R at D
M;&]G:6Y#;W!Y<FEG:'1787)R86YT>5!R;W9I9&5R*2P@)SQA(&AR968](B<@
M+B!H=&UL<W!E8VEA;&-H87)S*"1L;V=I;D-O<'ER:6=H=%=A<G)A;G1Y55),
M*2 N("<B('1A<F=E=#TB7V)L86YK(CXG+" G/"]A/B<I.PH@"0E](&5L<V4@
M>PHM"0D))'=A<G)A;G1Y3F]T93TG5%E03S, at 8V]M97,@=VET:"!!0E-/3%54
M14Q9($Y/(%=!4E)!3E19.R \82!H<F5F/2)H='1P.B\O='EP;S,N8V]M+S$S
M,38N,"YH=&UL(B!T87)G970](E]B;&%N:R(^8VQI8VL at 9F]R(&1E=&%I;',N
M/"]A/B<["BL)"0DD=V%R<F%N='E.;W1E(#T@<W!R:6YT9B at D1TQ/0D%,4ULG
M3$%.1R==+3YG971,3"@G;F\N=V%R<F%N='DG*2P@)SQA(&AR968](FAT=' Z
M+R]T>7!O,RYC;VTO,3,Q-BXP+FAT;6PB('1A<F=E=#TB7V)L86YK(CXG+" G
M/"]A/B<I.PH@"0E]"B *( D)"2\O($-O;7!I;&4 at 9G5L;"!C;W!Y<FEG:'0@
M;F]T:6-E. at H@"0DD8V]P>7)I9VAT3F]T:6-E(#T@)SQA(&AR968](FAT=' Z
M+R]T>7!O,RYC;VTO(B!T87)G970](E]B;&%N:R(^)RX*+0D)"0D))SQI;6<@
M<W)C/2(G+B1L;V=I;DEM86=E4VUA;&PN)R(@86QT/2)465!/,R!L;V=O(B!A
M;&EG;CTB;&5F="(@+SXG+ at HM"0D)"0DG5%E03S, at 0TU3)RXH)$=,3T)!3%-;
M)U194$\S7T-/3D9?5D%24R==6R=365,G75LG;&]G:6Y#;W!Y<FEG:'13:&]W
M5F5R<VEO;B==/R<@=F5R+B G+FAT;6QS<&5C:6%L8VAA<G,H)$=,3T)!3%-;
M)U194$]?5D524TE/3B==*3HG)RDN"BT)"0D)"2<\+V$^+B G+ at HM"0D)"0DG
M0V]P>7)I9VAT("9C;W!Y.R G+E194$\S7V-O<'ER:6=H=%]Y96%R+B<@2V%S
M<&5R(%-K)B,R,CD[<F at F(S(T.#MJ+B!%>'1E;G-I;VYS(&%R92!C;W!Y<FEG
M:'0@;V8@=&AE:7(@<F5S<&5C=&EV92!O=VYE<G,N("<N"BT)"0D)"2=';R!T
M;R \82!H<F5F/2)H='1P.B\O='EP;S,N8V]M+R(@=&%R9V5T/2)?8FQA;FLB
M/FAT=' Z+R]T>7!O,RYC;VTO/"]A/B!F;W(@9&5T86EL<RX@)RX*+0D)"0D)
M)'=A<G)A;G1Y3F]T92XG("<N"BT)"0D)"2=4:&ES(&ES(&9R964@<V]F='=A
M<F4L(&%N9"!Y;W4 at 87)E('=E;&-O;64@=&\@<F5D:7-T<FEB=71E(&ET('5N
M9&5R(&-E<G1A:6X at 8V]N9&ET:6]N<SL@/&$@:')E9CTB:'1T<#HO+W1Y<&\S
M+F-O;2\Q,S$V+C N:'1M;"(@=&%R9V5T/2)?8FQA;FLB/F-L:6-K(&9O<B!D
M971A:6QS/"]A/BX@)RX*+0D)"0D))T]B<W1R=6-T:6YG('1H92!A<'!E87)A
M;F-E(&]F('1H:7,@;F]T:6-E(&ES('!R;VAI8FET960 at 8GD@;&%W+B<["BL)
M"0D)"2<\:6UG('-R8STB)R N("1L;V=I;DEM86=E4VUA;&P at +B G(B!A;'0]
M(B<@+B D1TQ/0D%,4ULG3$%.1R==+3YG971,3"@G='EP;S,N;&]G;R<I("X@
M)R(@86QI9VX](FQE9G0B("\^)R N"BL)"0D)"21'3$]"04Q36R=,04Y')UTM
M/F=E=$Q,*"=T>7!O,RYC;7,G*2 N("@D1TQ/0D%,4ULG5%E03S-?0T].1E]6
M05)3)UU;)U-94R==6R=L;V=I;D-O<'ER:6=H=%-H;W=697)S:6]N)UT_)R G
M("X@)$=,3T)!3%-;)TQ!3D<G72T^9V5T3$PH)W9E<G-I;VXN<VAO<G0G*2 N
M("<@)R N(&AT;6QS<&5C:6%L8VAA<G,H)$=,3T)!3%-;)U194$]?5D524TE/
M3B==*3HG)RD at +@HK"0D)"0DG/"]A/BX@)R N"BL)"0D)"21'3$]"04Q36R=,
M04Y')UTM/F=E=$Q,*"=C;W!Y<FEG:'0G*2 N("<@)F-O<'D[("<@+B!465!/
M,U]C;W!Y<FEG:'1?>65A<B N("<@2V%S<&5R(%-K)B,R,CD[<F at F(S(T.#MJ
M+B G("X@)$=,3T)!3%-;)TQ!3D<G72T^9V5T3$PH)V5X=&5N<VEO;BYC;W!Y
M<FEG:'0G*2 N("<@)R N"BL)"0D)"7-P<FEN=&8H)$=,3T)!3%-;)TQ!3D<G
M72T^9V5T3$PH)V1E=&%I;',N;&EN:R<I+" G/&$@:')E9CTB:'1T<#HO+W1Y
M<&\S+F-O;2\B('1A<F=E=#TB7V)L86YK(CYH='1P.B\O='EP;S,N8V]M+SPO
M83XG*2 N("<@)R N"BL)"0D)"21W87)R86YT>4YO=&4 at +B G("<@+ at HK"0D)
M"0ES<')I;G1F*"1'3$]"04Q36R=,04Y')UTM/F=E=$Q,*"=F<F5E+G-O9G1W
M87)E)RDL("<\82!H<F5F/2)H='1P.B\O='EP;S,N8V]M+S$S,38N,"YH=&UL
M(B!T87)G970](E]B;&%N:R(^)RP@)SPO83X@)RD at +@HK"0D)"0DD1TQ/0D%,
M4ULG3$%.1R==+3YG971,3"@G:V5E<"YN;W1I8V4G*3L*( H@"0D)+R\@4F5T
H=7)N(&YO=&EC93H*( D)<F5T=7)N("1C;W!Y<FEG:'1.;W1I8V4["@``
`
end
More information about the TYPO3-team-core
mailing list