- no localization - everything is in english.
The patch below provides internationalization framework,
as well as s/killed/deleted/ for $status.
Thanks,
/Autrijus/
diff -dur Statistics.old/CallsMultiQueue/Elements/Chart Statistics/CallsMultiQueue/Elements/Chart
— Statistics.old/CallsMultiQueue/Elements/Chart Thu Jul 24 20:01:10 2003
+++ Statistics/CallsMultiQueue/Elements/Chart Fri Jul 25 14:38:59 2003
@@ -1,28 +1,22 @@
-<%perl>
-print $graph->plot(@data)->$format();
-$m->abort();
-print “”;
-print $#data+1 . " Plot Elements:
";
-for (0…$#data) {
- print $data[$_];
- print “
”;
-}
-print “x_labels:
”;
-print $ARGS{x_labels};
-print “
”;
-print “legend:
”;
-print $ARGS{set_legend};
-print “
”;
+% $m->print($graph->plot(@data)->$format());
+% $m->abort();
+<&|/l, $#data+1&>[1] Plot Elements</&>
+% foreach my $value (@data) {
+<% $value %>
+% }
+<&|/l&>x_labels</&>:
+<% $ARGS{x_labels} %>
+
+<&|/l&>legend</&>:
+<% $ARGS{set_legend} %>
+
+<&|/l, (keys %ARGS) - 2&>[1] data sets</&>:
+% for (1…(scalar keys %ARGS)-2) {
+<% $ %> <% $ARGS{"data$"} %>
+% }
-print “”;
-print ((scalar keys %ARGS)-2);
-print " data sets:
";
-for (1…(scalar keys %ARGS)-2) {
@@ -31,7 +25,7 @@
my $format = $graph->export_format;
$graph->set(export_format => “png”);
$graph->set_legend(split /,/ , $ARGS{set_legend});
-print $r->header_out(“image/$format”);
+$r->content_type(“image/$format”);
push @data, [split /,/ , $ARGS{x_labels}];
for (1…((scalar keys %ARGS)-2)) {
push @data, [split /,/ , $ARGS{“data”.$_}];
diff -dur Statistics.old/CallsMultiQueue/index.html Statistics/CallsMultiQueue/index.html
— Statistics.old/CallsMultiQueue/index.html Thu Jul 24 20:01:10 2003
+++ Statistics/CallsMultiQueue/index.html Fri Jul 25 14:41:32 2003
@@ -1,5 +1,5 @@
-<& /Elements/Header, Title => ‘RT Statistics: Calls per queue per day’ &>
-<& /Statistics/Elements/Tabs, Title => ‘RT Statistics: Calls per queue per day’ &>
+<& /Elements/Header, Title => loc(‘RT Statistics: Calls per queue per day’) &>
+<& /Statistics/Elements/Tabs, Title => loc(‘RT Statistics: Calls per queue per day’) &>
@@ -12,7 +12,7 @@
-
+
% my @legend;
% for (sort keys %queues) {
% push @legend, $_;
@@ -52,8 +52,8 @@
% $tix->LimitCreated(VALUE => $dates[$d+1]->ISO, OPERATOR => "<=");
% }
% }
-% elsif ($status eq "killed") {
-% $tix->LimitStatus(VALUE => "dead");
+% elsif ($status eq "deleted") {
+% $tix->LimitStatus(VALUE => $status);
% $tix->LimitLastUpdated(VALUE => $dates[$d]->ISO, OPERATOR => ">=");
% if ($dates[$d+1]) {
% $tix->LimitLastUpdated(VALUE => $dates[$d+1]->ISO, OPERATOR => "<=");
@@ -68,26 +68,26 @@
% }
-Show:
+<&|/l&>Show</&>:
-% for (qw(resolved created killed)) {
+% for (qw(resolved created deleted)) {
<OPTION VALUE=“<% $_ %>” <% $_ eq $status && “SELECTED” %>>
- <% loc($_) %>
% }
-Add Queue: -
+<&|/l&>Add Queue</&>: -
% while (my $q = $queue->Next) {
% next if exists $queues{$q->Name} or !$q->CurrentUserHasRight(‘SeeQueue’);<% $q->Name %>
% }
-Days to see:
+<&|/l&>Days to see</&>:
-See weekends:
+<&|/l&>See weekends</&>:
<INPUT TYPE=“checkbox” <% $weekends && ‘CHECKED’ %> name=“weekends”>
-<INPUT TYPE=“submit” VALUE=“Go!”
+<INPUT TYPE=“submit” VALUE=“<&|/l&>Go!</&>”
Only in Statistics.old/CallsQueueDay: .index.html.swp
diff -dur Statistics.old/CallsQueueDay/Elements/Chart Statistics/CallsQueueDay/Elements/Chart
— Statistics.old/CallsQueueDay/Elements/Chart Thu Jul 24 20:01:10 2003
+++ Statistics/CallsQueueDay/Elements/Chart Fri Jul 25 14:37:49 2003
@@ -1,12 +1,9 @@
-<%perl>
-print $graph->plot(@data)->$format();
-$m->abort();
-print $#data+1 . " Elements:
";
-for (0…$#data) {
-print $data[$_];
-print “
”;
-}
-</%perl>
+% $m->print($graph->plot(@data)->$format());
+% $m->abort();
+<&|/l, $#data+1&>[1] Elements</&>:
+% for (0…$#data) {
+<% $data[$] %>
+% }
<%INIT>
use GD::Graph::lines;
@@ -20,7 +17,7 @@
push @data, [split /,/ , $ARGS{data3}];
my $format = $graph->export_format;
-print $r->header_out(“image/$format”);
+$r->content_type(“image/$format”);
</%INIT>
<%ARGS>
</%ARGS>
diff -dur Statistics.old/CallsQueueDay/index.html Statistics/CallsQueueDay/index.html
— Statistics.old/CallsQueueDay/index.html Thu Jul 24 20:01:10 2003
+++ Statistics/CallsQueueDay/index.html Fri Jul 25 14:41:55 2003
@@ -1,13 +1,13 @@
-<& /Elements/Header, Title => ‘RT Statistics: Calls per day’ &>
-<& /Statistics/Elements/Tabs, Title => ‘RT Statistics: Calls per day’ &>
+<& /Elements/Header, Title => loc(‘RT Statistics: Calls per day’) &>
+<& /Statistics/Elements/Tabs, Title => loc(‘RT Statistics: Calls per day’) &>
-
-% for my $status (qw(resolved created killed)) {
-
+% for my $status (qw(resolved created deleted)) {
+
% for my $d (0..$#dates) {
@@ -15,7 +15,7 @@
| Dates | <% $status %>
+ | <&|/l&>Dates | <% loc($status) %>
% }
|
|---|
| <% $days[(localtime($dates[$d]->Unix))[6]]." ". (localtime($dates[$d]->Unix))[3]%>
-% for my $status (qw(resolved created killed)) {
+% for my $status (qw(resolved created deleted)) {
% my $tix = new RT::Tickets($session{‘CurrentUser’});
|
% if ($status eq “resolved”) {
@@ -31,8 +31,8 @@
% $tix->LimitCreated(VALUE => $dates[$d+1]->ISO, OPERATOR => “<=”);
% }
% }
-% elsif ($status eq “killed”) {
-% $tix->LimitStatus(VALUE => “dead”);
+% elsif ($status eq “deleted”) {
+% $tix->LimitStatus(VALUE => $status);
% $tix->LimitLastUpdated(VALUE => $dates[$d]->ISO, OPERATOR => “>=”);
% if ($dates[$d+1]) {
% $tix->LimitLastUpdated(VALUE => $dates[$d+1]->ISO, OPERATOR => “<=”);
@@ -47,13 +47,13 @@
%}
|
-See Queue:
+<&|/l&>See Queue</&>:
<& /Elements/SelectQueue, Name=>“queue”, ShowNullOption=>0 &>
-Days to see:
+<&|/l&>Days to see</&>:
-See weekends:
+<&|/l&>See weekends</&>:
<INPUT TYPE=“checkbox” <% $weekends && ‘CHECKED’ %> name=“weekends”>
-<INPUT TYPE=“submit” VALUE=“Go!”
+<INPUT TYPE=“submit” VALUE=“<&|/l&>Go!</&>”
<%perl>
@@ -71,8 +71,8 @@
![]()
- Resolved Created
- Killed
+ <&|/l&>Resolved <&|/l&>Created
+ <&|/l&>Killed
<%ARGS>
$max => 5
diff -dur Statistics.old/DayOfWeek/Elements/Chart Statistics/DayOfWeek/Elements/Chart
— Statistics.old/DayOfWeek/Elements/Chart Fri Jul 25 14:39:28 2003
+++ Statistics/DayOfWeek/Elements/Chart Fri Jul 25 14:39:04 2003
@@ -1,12 +1,9 @@
-<%perl>
-print $graph->plot(@data)->$format();
-$m->abort();
-print $#data+1 . " Elements:
";
-for (0…$#data) {
-print $data[$_];
-print “
”;
-}
-</%perl>
+% $m->print($graph->plot(@data)->$format());
+% $m->abort();
+<&|/l, $#data+1&>[1] Elements</&>:
+% for (0…$#data) {
+<% $data[$] %>
+% }
<%INIT>
use GD::Graph::bars;
@@ -20,7 +17,7 @@
push @data, [split /,/ , $ARGS{data3}];
my $format = $graph->export_format;
-print $r->header_out(“image/$format”);
+$r->content_type(“image/$format”);
</%INIT>
<%ARGS>
</%ARGS>
diff -dur Statistics.old/DayOfWeek/index.html Statistics/DayOfWeek/index.html
— Statistics.old/DayOfWeek/index.html Thu Jul 24 20:01:10 2003
+++ Statistics/DayOfWeek/index.html Fri Jul 25 14:42:28 2003
@@ -1,30 +1,30 @@
-<& /Elements/Header, Title =>‘RT Statistics: Calls by Day Of Week’ &>
-<& /Statistics/Elements/Tabs, Title =>‘RT Statistics: Calls by Day Of Week’ &>
+<& /Elements/Header, Title =>loc(‘RT Statistics: Calls by Day Of Week’) &>
+<& /Statistics/Elements/Tabs, Title =>loc(‘RT Statistics: Calls by Day Of Week’) &>
-
Number of Tickets Handled in <% $QueueObj->Name %> Per Day
+
<&|/l, $QueueObj->Name&>Number of Tickets Handled in [_1] Per Day</&>
-
-% for my $status (qw(resolved created killed)) {
-
+% for my $status (qw(resolved created deleted)) {
+
% for my $d (0..$#days) {
-
-% for my $status (qw(resolved created killed)) {
+
+% for my $status (qw(resolved created deleted)) {
% }
% }
| Dates | <% $status %>
+ | <&|/l&>Dates | <% loc($status) %>
% }
|
|---|
| <% $days[$d] %> | <% loc($days[$d]) %> | <% $counts[$d]{$status} %> |
-See Queue:
+<&|/l&>See Queue</&>:
<& /Elements/SelectQueue, Name=>“queue”, ShowNullOption=>0 &>
-<INPUT TYPE=“submit” VALUE=“Go!”
+<INPUT TYPE=“submit” VALUE=“<&|/l&>Go!</&>”
@@ -36,7 +36,7 @@
chop $url;
$url .= "&";
-my @things = qw(resolved created killed);
+my @things = qw(resolved created deleted);
for my $th (0…$#things) {
$url .= “data”.(1+$th).“=”.(join “,”, map { $counts[$_]{$things[$th]} } (0…6)).“&”;
}
@@ -44,8 +44,8 @@
</%perl>
![]()
- Resolved Created
- Killed
+ <&|/l&>Resolved</&> <&|/l&>Created</&>
+ <&|/l&>Killed</&>
<%ARGS>
$max => 5
@@ -72,8 +72,8 @@
while (my $t = $tix->RT::SearchBuilder::Next) { # BLOODY HACK
$counts[(localtime($t->ResolvedObj->Unix))[6]]{resolved}++
if $t->Status eq “resolved”;
- my $tabs = { CallsByDay => { title => ‘Calls per Queue per day’,
- my $tabs = { CallsByDay => { title => loc(‘Calls per Queue per day’),
path => ‘CallsByDay.html’
},
-
CallsMultiQueue => { title => loc('Calls by Multiple Queues per day'),
path => 'CallsMultiQueue.html',
},
diff -dur Statistics.old/Elements/DurationAsString Statistics/Elements/DurationAsString
— Statistics.old/Elements/DurationAsString Thu Jul 24 20:01:10 2003
+++ Statistics/Elements/DurationAsString Thu Jul 24 20:02:39 2003
@@ -1,4 +1,4 @@
-<%$days|‘00’%> days <%$hours|‘00’%>:<%$minutes|‘00’%>
+<%$days|‘00’%> <&|/l&>days</&> <%$hours|‘00’%>:<%$minutes|‘00’%>
<%INIT>
my $MINUTE = 60;
diff -dur Statistics.old/Resolution/Elements/Chart Statistics/Resolution/Elements/Chart
— Statistics.old/Resolution/Elements/Chart Thu Jul 24 20:01:10 2003
+++ Statistics/Resolution/Elements/Chart Fri Jul 25 14:39:12 2003
@@ -1,12 +1,9 @@
-<%perl>
-print $graph->plot(@data)->$format();
-$m->abort();
-print $#data+1 . " Elements:
";
-for (0…$#data) {
-print $data[$_];
-print “
”;
-}
-</%perl>
+% $m->print($graph->plot(@data)->$format());
+% $m->abort();
+<&|/l, $#data+1&>[1] Elements</&>:
+% for (0…$#data) {
+<% $data[$] %>
+% }
<%INIT>
use GD::Graph::lines;
@@ -20,7 +17,7 @@
push @data, [split /,/ , $ARGS{data3}];
my $format = $graph->export_format;
-print $r->header_out(“image/$format”);
+$r->content_type(“image/$format”);
</%INIT>
<%ARGS>
</%ARGS>
diff -dur Statistics.old/Resolution/index.html Statistics/Resolution/index.html
— Statistics.old/Resolution/index.html Thu Jul 24 20:01:10 2003
+++ Statistics/Resolution/index.html Fri Jul 25 14:28:59 2003
@@ -1,15 +1,15 @@
-<& /Elements/Header, Title => ‘RT Statistics: Average Time To Resolution’ &>
-<& /Statistics/Elements/Tabs, Title => “RT Statistics: Average Time To Resolution” &>
+<& /Elements/Header, Title => loc(‘RT Statistics: Average Time To Resolution’) &>
+<& /Statistics/Elements/Tabs, Title => loc(“RT Statistics: Average Time To Resolution”) &>
-
Times for <% $QueueObj->Name || “All Queues” %>
+
<&|/l, $QueueObj->Name || loc(‘All Queues’)&>Times for [_1]</&>
-
-
-
-
+
+
+
+
% for my $d (0..$#dates) {
% my $x = 1;
@@ -42,25 +42,25 @@
<& /Statistics/Elements/DurationAsString, Duration => $average &>
% $data[$x++][$d] = $average;
% } else {
- N/A
+ <&|/l&>N/A
% }
%}
| Dates | Tickets Created On This Day | Resolved | Time to Resolution | <&|/l&>Dates | <&|/l&>Tickets Created On This Day | <&|/l&>Resolved | <&|/l&>Time to Resolution |
|---|
-See Queue:
+<&|/l&>See Queue</&>:
<& /Elements/SelectQueue, Name=>“queue”, ShowNullOption=>1 &>
-Days to see:
+<&|/l&>Days to see</&>:
-See weekends:
+<&|/l&>See weekends</&>:
<INPUT TYPE=“checkbox” <% $weekends && ‘CHECKED’ %> name=“weekends”>
-<INPUT TYPE=“submit” VALUE=“Go!”
+<INPUT TYPE=“submit” VALUE=“<&|/l&>Go!</&>”
diff -dur Statistics.old/TimeToResolve/Elements/Chart Statistics/TimeToResolve/Elements/Chart
--- Statistics.old/TimeToResolve/Elements/Chart Thu Jul 24 20:01:10 2003
+++ Statistics/TimeToResolve/Elements/Chart Fri Jul 25 14:39:19 2003
@@ -1,28 +1,22 @@
-<%perl>
-print $graph->plot(\@data)->$format();
-$m->abort();
-print "
";
-print $#data+1 . " Plot Elements:";
-for (0..$#data) {
- print $data[$_];
- print "
";
-}
-print "x_labels:
";
-print $ARGS{x_labels};
-print "
";
-print "legend:
";
-print $ARGS{set_legend};
-print "
";
+% $m->print($graph->plot(\@data)->$format());
+% $m->abort();
+<&|/l, $#data+1&>[_1] Plot Elements
+% foreach my $value (@data) {
+<% $value %>
+% }
+<&|/l&>x_labels:
+<% $ARGS{x_labels} %>
+
+<&|/l&>legend:
+<% $ARGS{set_legend} %>
+
+<&|/l, (keys %ARGS) - 2&>[_1] data sets:
+% for (1..(scalar keys %ARGS)-2) {
+<% $_ %> <% $ARGS{"data$_"} %>
+% }
-print “”;
-print ((scalar keys %ARGS)-2);
-print " data sets:
";
-for (1…(scalar keys %ARGS)-2) {
@@ -30,7 +24,7 @@
my $graph = GD::Graph::points->new(400,300);
my $format = $graph->export_format;
$graph->set(export_format => “png”, marker_size => $ARGS{marker_size});
-print $r->header_out(“image/$format”);
+$r->content_type(“image/$format”);
push @data, [split /,/ , $ARGS{x_labels}];
for (1…((scalar keys %ARGS)-2)) {
push @data, [split /,/ , $ARGS{“data”.$_}];
diff -dur Statistics.old/TimeToResolve/index.html Statistics/TimeToResolve/index.html
— Statistics.old/TimeToResolve/index.html Thu Jul 24 20:01:10 2003
+++ Statistics/TimeToResolve/index.html Fri Jul 25 14:29:46 2003
@@ -1,13 +1,13 @@
-<& /Elements/Header, Title => ‘RT Statistics: Time to Resolve’ &>
-<& /Statistics/Elements/Tabs, Title => ‘Time to Resolve, by ticket’ &>
+<& /Elements/Header, Title => loc(‘RT Statistics: Time to Resolve’) &>
+<& /Statistics/Elements/Tabs, Title => loc(‘Time to Resolve, by ticket’) &>
-See Queue:
+<&|/l&>See Queue</&>:
<& /Elements/SelectQueue, Name=>“queue”, Default => “$queue” &>
-<INPUT TYPE=“submit” VALUE=“Go!”
+<INPUT TYPE=“submit” VALUE=“<&|/l&>Go!</&>”
diff -dur Statistics.old/index.html Statistics/index.html
--- Statistics.old/index.html Thu Jul 24 20:01:10 2003
+++ Statistics/index.html Thu Jul 24 20:01:32 2003
@@ -1,6 +1,6 @@
-RT Statistics
+<&|/l&>RT Statistics
-<& /Elements/Header, Title => 'Statistics' &>
-<& /Statistics/Elements/Tabs, Title => 'Statistics' &>
+<& /Elements/Header, Title => loc('Statistics') &>
+<& /Statistics/Elements/Tabs, Title => loc('Statistics') &>
