[TYPO3-core] RFC #11437: New labels in the log module are hardcoded
Christopher Stelmaszyk
christopher at yahoo.de
Sun Jun 28 15:52:17 CEST 2009
Hi!
This is a SVN patch request.
Type: feature
Branches: trunk
BT reference:
http://bugs.typo3.org/view.php?id=11437
Problem:
There were new texts added to that module, which are hardcoded.
Solution:
This patch changes this drawback.
Note:
In the last changed lines there is a rather complicated string.
See the way how I named the labels to make clear, how they are combined.
I think that this way it is easy for translators to understand the
combination.
If you have a better idea, you are welcome to change this part accordingly.
Kind regards
Christopher
Index: typo3/sysext/belog/mod/locallang.xml
===================================================================
--- typo3/sysext/belog/mod/locallang.xml (revision 5635)
+++ typo3/sysext/belog/mod/locallang.xml (working copy)
@@ -32,10 +32,21 @@
<label index="actionSettings">Settings</label>
<label index="actionLogin">Login</label>
<label index="actionErrors">Errors</label>
+ <label index="group">Group:</label>
+ <label index="user">User:</label>
<label index="users">Users:</label>
<label index="time">Time:</label>
<label index="max">Max:</label>
<label index="action">Action:</label>
+ <label index="workspace">Workspace:</label>
+ <label index="groupByPage">Group by page:</label>
+ <label index="pagenameWithUID">"%s" (UID %s)</label>
+ <label index="overview">Overview</label>
+ <label index="timeInfo">These pages have log messages from %s to
%s</label>
+ <label index="forNonPageRelatedActions">for NON-PAGE related
actions</label>
+ <label index="forRootLevel">for ROOT LEVEL</label>
+ <label index="forPage">for PAGE "%s" (UID %s)</label>
+ <label index="logForNonPageRelatedActionsOrRootLevelOrPage">Log %s from
%s to %s</label>
<label index="type_1">DB</label>
<label index="action_1_1">Insert</label>
<label index="action_1_2">Update</label>
Index: typo3/sysext/belog/mod/index.php
===================================================================
--- typo3/sysext/belog/mod/index.php (revision 5635)
+++ typo3/sysext/belog/mod/index.php (working copy)
@@ -173,14 +173,14 @@
$groups = t3lib_BEfunc::getGroupNames();
if (is_array($groups)) {
while(list(,$grVals)=each($groups)) {
- $this->MOD_MENU['users']['gr-'.$grVals['uid']] = 'Group:
'.$grVals['title'];
+ $this->MOD_MENU['users']['gr-' . $grVals['uid']] =
$GLOBALS['LANG']->getLL('group') . ' ' . $grVals['title'];
}
}
$users = t3lib_BEfunc::getUserNames();
if (is_array($users)) {
while(list(,$grVals)=each($users)) {
- $this->MOD_MENU['users']['us-'.$grVals['uid']] = 'User:
'.$grVals['username'];
+ $this->MOD_MENU['users']['us-' . $grVals['uid']] =
$GLOBALS['LANG']->getLL('user') . ' ' . $grVals['username'];
}
}
@@ -239,8 +239,8 @@
array($GLOBALS['LANG']->getLL('action'), $menuA)
),
array(
- $GLOBALS['BE_USER']->workspace!==0 ?
array('Workspace:','<b>'.$GLOBALS['BE_USER']->workspace.'</b>') :
array('Workspace:',$menuW),
- array('Group by page:',$groupByPage)
+ $GLOBALS['BE_USER']->workspace!==0 ?
array($GLOBALS['LANG']->getLL('workspace'),'<b>'.$GLOBALS['BE_USER']->workspace.'</b>')
: array($GLOBALS['LANG']->getLL('workspace'),$menuW),
+ array($GLOBALS['LANG']->getLL('groupByPage'),$groupByPage)
)
));
#$this->content.=$this->doc->divider(5);
@@ -344,12 +344,23 @@
$overviewList = array();
foreach($logPids as $pid) {
if ((int)$pid>0) {
- $overviewList[]=
htmlspecialchars(t3lib_BEfunc::getRecordPath($pid,'',20).'"
[UID:'.$pid.']');
+ $overviewList[]= sprintf(
+ $GLOBALS['LANG']->getLL('pagenameWithUID'),
+ htmlspecialchars(t3lib_BEfunc::getRecordPath($pid,'',20)),
+ $pid
+ );
}
}
sort($overviewList);
$this->content.=$this->doc->divider(5);
- $this->content.= $this->doc->section('Overview', 'These pages have log
messages from ' . date('Y-m-d H:i:s', $starttime) . ' to ' . date('Y-m-d
H:i:s', $endtime) . '<br /><br /><br />' . implode('<br />', $overviewList),
1, 1, 0);
+ $this->content.= $this->doc->section(
+ $GLOBALS['LANG']->getLL('overview'),
+ sprintf($GLOBALS['LANG']->getLL('timeInfo'),
+ date('Y-m-d H:i:s', $starttime),
+ date('Y-m-d H:i:s', $endtime)) .
+ '<br /><br /><br />' . implode('<br />', $overviewList),
+ 1, 1, 0
+ );
$this->content.=$this->doc->spacer(30);
} else $logPids[] = '_SINGLE';
@@ -365,16 +376,23 @@
$insertMsg = '';
break;
case '-1':
- $insertMsg = ' for NON-PAGE related actions ';
+ $insertMsg = ' ' . $GLOBALS['LANG']->getLL('forNonPageRelatedActions')
. ' ';
break;
case '0':
- $insertMsg = ' for ROOT LEVEL ';
+ $insertMsg = ' ' . $GLOBALS['LANG']->getLL('forRootLevel') . ' ';
break;
default:
- $insertMsg = ' for PAGE "'.t3lib_BEfunc::getRecordPath($pid,'',20).'"
('.$pid.') ';
+ $insertMsg = ' ' . sprintf($GLOBALS['LANG']->getLL('forPage'),
t3lib_BEfunc::getRecordPath($pid,'',20), $pid) . ' ';
break;
}
- $this->content.=$this->doc->section('Log '.$insertMsg.'from
'.date('Y-m-d H:i:s',$starttime).' to '.date('Y-m-d
H:i:s',$endtime),'',1,1,0);
+ $this->content.=$this->doc->section(
+
sprintf($GLOBALS['LANG']->getLL('logForNonPageRelatedActionsOrRootLevelOrPage'),
+ $insertMsg,
+ date('Y-m-d H:i:s', $starttime),
+ date('Y-m-d H:i:s', $endtime)
+ ),
+ '',1,1,0
+ );
$log = $GLOBALS['TYPO3_DB']->exec_SELECTquery('*', 'sys_log',
'1=1'.$where_part.($pid!='_SINGLE'?' AND event_pid='.intval($pid):''), '',
'uid DESC', intval($this->MOD_SETTINGS['max']));
begin 666 11437.patch
M26YD97 at Z('1Y<&\S+W-Y<V5X="]B96QO9R]M;V0O;&]C86QL86YG+GAM; T*
M/3T]/3T]/3T]/3T]/3T]/3T]/3T]/3T]/3T]/3T]/3T]/3T]/3T]/3T]/3T]
M/3T]/3T]/3T]/3T]/3T]/3T]/3T]/0T*+2TM('1Y<&\S+W-Y<V5X="]B96QO
M9R]M;V0O;&]C86QL86YG+GAM; DH<F5V:7-I;VX at -38S-2D-"BLK*R!T>7!O
M,R]S>7-E>'0O8F5L;V<O;6]D+VQO8V%L;&%N9RYX;6P)*'=O<FMI;F<@8V]P
M>2D-"D! ("TS,BPQ," K,S(L,C$@0$ -"B )"0D\;&%B96P@:6YD97@](F%C
M=&EO;E-E='1I;F=S(CY3971T:6YG<SPO;&%B96P^"B )"0D\;&%B96P@:6YD
M97@](F%C=&EO;DQO9VEN(CY,;V=I;CPO;&%B96P^"B )"0D\;&%B96P@:6YD
M97@](F%C=&EO;D5R<F]R<R(^17)R;W)S/"]L86)E;#X**PD)"3QL86)E;"!I
M;F1E>#TB9W)O=7 B/D=R;W5P.CPO;&%B96P^"BL)"0D\;&%B96P@:6YD97@]
M(G5S97(B/E5S97(Z/"]L86)E;#X*( D)"3QL86)E;"!I;F1E>#TB=7-E<G,B
M/E5S97)S.CPO;&%B96P^"B )"0D\;&%B96P@:6YD97@](G1I;64B/E1I;64Z
M/"]L86)E;#X*( D)"3QL86)E;"!I;F1E>#TB;6%X(CY-87 at Z/"]L86)E;#X*
M( D)"3QL86)E;"!I;F1E>#TB86-T:6]N(CY!8W1I;VXZ/"]L86)E;#X**PD)
M"3QL86)E;"!I;F1E>#TB=V]R:W-P86-E(CY7;W)K<W!A8V4Z/"]L86)E;#X*
M*PD)"3QL86)E;"!I;F1E>#TB9W)O=7!">5!A9V4B/D=R;W5P(&)Y('!A9V4Z
M/"]L86)E;#X**PD)"3QL86)E;"!I;F1E>#TB<&%G96YA;657:71H54E$(CXB
M)7,B("A5240@)7,I/"]L86)E;#X**PD)"3QL86)E;"!I;F1E>#TB;W9E<G9I
M97<B/D]V97)V:65W/"]L86)E;#X**PD)"3QL86)E;"!I;F1E>#TB=&EM94EN
M9F\B/E1H97-E('!A9V5S(&AA=F4@;&]G(&UE<W-A9V5S(&9R;VT@)7,@=&\@
M)7,\+VQA8F5L/@HK"0D)/&QA8F5L(&EN9&5X/2)F;W).;VY086=E4F5L871E
M9$%C=&EO;G,B/F9O<B!.3TXM4$%'12!R96QA=&5D(&%C=&EO;G,\+VQA8F5L
M/@HK"0D)/&QA8F5L(&EN9&5X/2)F;W)2;V]T3&5V96PB/F9O<B!23T]4($Q%
M5D5,/"]L86)E;#X**PD)"3QL86)E;"!I;F1E>#TB9F]R4&%G92(^9F]R(%!!
M1T4@(B5S(B H54E$("5S*3PO;&%B96P^"BL)"0D\;&%B96P@:6YD97@](FQO
M9T9O<DYO;E!A9V5296QA=&5D06-T:6]N<T]R4F]O=$QE=F5L3W)086=E(CY,
M;V<@)7, at 9G)O;2 E<R!T;R E<SPO;&%B96P^"B )"0D\;&%B96P@:6YD97@]
M(G1Y<&5?,2(^1$(\+VQA8F5L/@H@"0D)/&QA8F5L(&EN9&5X/2)A8W1I;VY?
M,5\Q(CY);G-E<G0\+VQA8F5L/@H@"0D)/&QA8F5L(&EN9&5X/2)A8W1I;VY?
M,5\R(CY5<&1A=&4\+VQA8F5L/@I);F1E>#H@='EP;S,O<WES97AT+V)E;&]G
M+VUO9"]I;F1E>"YP:' -"CT]/3T]/3T]/3T]/3T]/3T]/3T]/3T]/3T]/3T]
M/3T]/3T]/3T]/3T]/3T]/3T]/3T]/3T]/3T]/3T]/3T]/3T]/3T-"BTM+2!T
M>7!O,R]S>7-E>'0O8F5L;V<O;6]D+VEN9&5X+G!H< DH<F5V:7-I;VX at -38S
M-2D-"BLK*R!T>7!O,R]S>7-E>'0O8F5L;V<O;6]D+VEN9&5X+G!H< DH=V]R
M:VEN9R!C;W!Y*0T*0$ @+3$W,RPQ-" K,3<S+#$T($! #0H@"0DD9W)O=7!S
M(#T@=#-L:6)?0D5F=6YC.CIG971'<F]U<$YA;65S*"D["B )"0EI9B H:7-?
M87)R87DH)&=R;W5P<RDI"7L*( D)"7=H:6QE*&QI<W0H+"1G<E9A;',I/65A
M8V at H)&=R;W5P<RDI"7L*+0D)"0DD=&AI<RT^34]$7TU%3E5;)W5S97)S)UU;
M)V=R+2<N)&=R5F%L<ULG=6ED)UU=(#T@)T=R;W5P.B G+B1G<E9A;'-;)W1I
M=&QE)UT["BL)"0D))'1H:7,M/DU/1%]-14Y56R=U<V5R<R==6R=G<BTG("X@
M)&=R5F%L<ULG=6ED)UU=(#T@)$=,3T)!3%-;)TQ!3D<G72T^9V5T3$PH)V=R
M;W5P)RD at +B G("<@+B D9W)686QS6R=T:71L92==.PH@"0D)?0H@"0E]"B *
M( D))'5S97)S(#T@=#-L:6)?0D5F=6YC.CIG9715<V5R3F%M97,H*3L*( D)
M:68@*&ES7V%R<F%Y*"1U<V5R<RDI"7L*( D)"7=H:6QE*&QI<W0H+"1G<E9A
M;',I/65A8V at H)'5S97)S*2D)>PHM"0D)"21T:&ES+3Y-3T1?345.55LG=7-E
M<G,G75LG=7,M)RXD9W)686QS6R=U:60G75T@/2 G57-E<CH@)RXD9W)686QS
M6R=U<V5R;F%M92==.PHK"0D)"21T:&ES+3Y-3T1?345.55LG=7-E<G,G75LG
M=7,M)R N("1G<E9A;'-;)W5I9"==72 ]("1'3$]"04Q36R=,04Y')UTM/F=E
M=$Q,*"=U<V5R)RD at +B G("<@+B D9W)686QS6R=U<V5R;F%M92==.PH@"0D)
M?0H@"0E]"B *0$ @+3(S.2PX("LR,SDL."! 0 T*( D)"0EA<G)A>2 at D1TQ/
M0D%,4ULG3$%.1R==+3YG971,3"@G86-T:6]N)RDL("1M96YU02D*( D)"2DL
M"B )"0EA<G)A>2@*+0D)"0DD1TQ/0D%,4ULG0D5?55-%4B==+3YW;W)K<W!A
M8V4A/3TP(#\@87)R87DH)U=O<FMS<&%C93HG+"<\8CXG+B1'3$]"04Q36R="
M15]54T52)UTM/G=O<FMS<&%C92XG/"]B/B<I(#H at 87)R87DH)U=O<FMS<&%C
M93HG+"1M96YU5RDL"BT)"0D)87)R87DH)T=R;W5P(&)Y('!A9V4Z)RPD9W)O
M=7!">5!A9V4I"BL)"0D))$=,3T)!3%-;)T)%7U5315(G72T^=V]R:W-P86-E
M(3T]," _(&%R<F%Y*"1'3$]"04Q36R=,04Y')UTM/F=E=$Q,*"=W;W)K<W!A
M8V4G*2PG/&(^)RXD1TQ/0D%,4ULG0D5?55-%4B==+3YW;W)K<W!A8V4N)SPO
M8CXG*2 Z(&%R<F%Y*"1'3$]"04Q36R=,04Y')UTM/F=E=$Q,*"=W;W)K<W!A
M8V4G*2PD;65N=5<I+ HK"0D)"6%R<F%Y*"1'3$]"04Q36R=,04Y')UTM/F=E
M=$Q,*"=G<F]U<$)Y4&%G92<I+"1G<F]U<$)Y4&%G92D*( D)"2D*( D)*2D[
M"B )"2,D=&AI<RT^8V]N=&5N="X])'1H:7,M/F1O8RT^9&EV:61E<B at U*3L*
M0$ @+3,T-"PQ,B K,S0T+#(S($! #0H@"0D))&]V97)V:65W3&ES=" ](&%R
M<F%Y*"D["B )"0EF;W)E86-H*"1L;V=0:61S(&%S("1P:60I"7L*( D)"0EI
M9B H*&EN="DD<&ED/C I"7L*+0D)"0D))&]V97)V:65W3&ES=%M=/2!H=&UL
M<W!E8VEA;&-H87)S*'0S;&EB7T)%9G5N8SHZ9V5T4F5C;W)D4&%T:"@D<&ED
M+"<G+#(P*2XG(B!;54E$.B<N)'!I9"XG72<I.PHK"0D)"0DD;W9E<G9I97=,
M:7-T6UT]('-P<FEN=&8H"BL)"0D)"0DD1TQ/0D%,4ULG3$%.1R==+3YG971,
M3"@G<&%G96YA;657:71H54E$)RDL"BL)"0D)"0EH=&UL<W!E8VEA;&-H87)S
M*'0S;&EB7T)%9G5N8SHZ9V5T4F5C;W)D4&%T:"@D<&ED+"<G+#(P*2DL"BL)
M"0D)"0DD<&ED"BL)"0D)"2D["B )"0D)?0H@"0D)?0H@"0D)<V]R="@D;W9E
M<G9I97=,:7-T*3L*( D)"21T:&ES+3YC;VYT96YT+CTD=&AI<RT^9&]C+3YD
M:79I9&5R*#4I.PHM"0D))'1H:7,M/F-O;G1E;G0N/2 D=&AI<RT^9&]C+3YS
M96-T:6]N*"=/=F5R=FEE=R<L("=4:&5S92!P86=E<R!H879E(&QO9R!M97-S
M86=E<R!F<F]M("<@+B!D871E*"=9+6TM9"!(.FDZ<R<L("1S=&%R='1I;64I
M("X@)R!T;R G("X at 9&%T92 at G62UM+60@2#II.G,G+" D96YD=&EM92D at +B G
M/&)R("\^/&)R("\^/&)R("\^)R N(&EM<&QO9&4H)SQB<B O/B<L("1O=F5R
M=FEE=TQI<W0I+" Q+" Q+" P*3L**PD)"21T:&ES+3YC;VYT96YT+CT@)'1H
M:7,M/F1O8RT^<V5C=&EO;B@**PD)"0DD1TQ/0D%,4ULG3$%.1R==+3YG971,
M3"@G;W9E<G9I97<G*2P**PD)"0ES<')I;G1F*"1'3$]"04Q36R=,04Y')UTM
M/F=E=$Q,*"=T:6UE26YF;R<I+ HK"0D)"0ED871E*"=9+6TM9"!(.FDZ<R<L
M("1S=&%R='1I;64I+ HK"0D)"0ED871E*"=9+6TM9"!(.FDZ<R<L("1E;F1T
M:6UE*2D at +@HK"0D)"2<\8G(@+SX\8G(@+SX\8G(@+SXG("X@:6UP;&]D92 at G
M/&)R("\^)RP@)&]V97)V:65W3&ES="DL"BL)"0D),2P@,2P@, HK"0D)*3L*
M( D)"21T:&ES+3YC;VYT96YT+CTD=&AI<RT^9&]C+3YS<&%C97(H,S I.PH@
M"0E](&5L<V4@)&QO9U!I9'-;72 ]("=?4TE.1TQ%)SL*( I 0" M,S8U+#$V
M("LS-S8L,C, at 0$ -"B )"0D)"21I;G-E<G1-<V<@/2 G)SL*( D)"0EB<F5A
M:SL*( D)"0EC87-E("<M,2<Z"BT)"0D)"21I;G-E<G1-<V<@/2 G(&9O<B!.
M3TXM4$%'12!R96QA=&5D(&%C=&EO;G,@)SL**PD)"0D))&EN<V5R=$US9R ]
M("<@)R N("1'3$]"04Q36R=,04Y')UTM/F=E=$Q,*"=F;W).;VY086=E4F5L
M871E9$%C=&EO;G,G*2 N("<@)SL*( D)"0EB<F5A:SL*( D)"0EC87-E("<P
M)SH*+0D)"0D))&EN<V5R=$US9R ]("<@9F]R(%)/3U0 at 3$5614P@)SL**PD)
M"0D))&EN<V5R=$US9R ]("<@)R N("1'3$]"04Q36R=,04Y')UTM/F=E=$Q,
M*"=F;W)2;V]T3&5V96PG*2 N("<@)SL*( D)"0EB<F5A:SL*( D)"0ED969A
M=6QT. at HM"0D)"0DD:6YS97)T37-G(#T@)R!F;W(@4$%'12 B)RYT,VQI8E]"
M169U;F,Z.F=E=%)E8V]R9%!A=&@H)'!I9"PG)RPR,"DN)R(@*"<N)'!I9"XG
M*2 G.PHK"0D)"0DD:6YS97)T37-G(#T@)R G("X@<W!R:6YT9B at D1TQ/0D%,
M4ULG3$%.1R==+3YG971,3"@G9F]R4&%G92<I+"!T,VQI8E]"169U;F,Z.F=E
M=%)E8V]R9%!A=&@H)'!I9"PG)RPR,"DL("1P:60I("X@)R G.PH@"0D)"6)R
M96%K.PH@"0D)?0HM"0D))'1H:7,M/F-O;G1E;G0N/21T:&ES+3YD;V,M/G-E
M8W1I;VXH)TQO9R G+B1I;G-E<G1-<V<N)V9R;VT@)RYD871E*"=9+6TM9"!(
M.FDZ<R<L)'-T87)T=&EM92DN)R!T;R G+F1A=&4H)UDM;2UD($@Z:3IS)RPD
M96YD=&EM92DL)R<L,2PQ+# I.PHK"0D))'1H:7,M/F-O;G1E;G0N/21T:&ES
M+3YD;V,M/G-E8W1I;VXH"BL)"0D)<W!R:6YT9B at D1TQ/0D%,4ULG3$%.1R==
M+3YG971,3"@G;&]G1F]R3F]N4&%G95)E;&%T961!8W1I;VYS3W)2;V]T3&5V
M96Q/<E!A9V4G*2P**PD)"0D))&EN<V5R=$US9RP**PD)"0D)9&%T92 at G62UM
M+60 at 2#II.G,G+" D<W1A<G1T:6UE*2P**PD)"0D)9&%T92 at G62UM+60@2#II
M.G,G+" D96YD=&EM92D**PD)"0DI+ HK"0D)"2<G+#$L,2PP"BL)"0DI.PH@
M"B )"0DD;&]G(#T@)$=,3T)!3%-;)U194$\S7T1")UTM/F5X96-?4T5,14-4
M<75E<GDH)RHG+" G<WES7VQO9R<L("<Q/3$G+B1W:&5R95]P87)T+B at D<&ED
M(3TG7U-)3D=,12<_)R!!3D0 at 979E;G1?<&ED/2<N:6YT=F%L*"1P:60I.B<G
M*2P@)R<L("=U:60 at 1$530R<L(&EN='9A;"@D=&AI<RT^34]$7U-%5%1)3D=3
-6R=M87 at G72DI.PH@"@``
`
end
More information about the TYPO3-team-core
mailing list