[Rt-commit] r16741 - in rt/3.8/trunk: lib/RT lib/RT/I18N share/html/Dashboards/Elements share/html/Search share/html/Search/Elements share/html/Ticket/Elements share/html/Widgets/Form
elacour at bestpractical.com
elacour at bestpractical.com
Fri Nov 7 18:40:20 EST 2008
Author: elacour
Date: Fri Nov 7 18:40:19 2008
New Revision: 16741
Modified:
rt/3.8/trunk/lib/RT/Config.pm
rt/3.8/trunk/lib/RT/I18N/fr.po
rt/3.8/trunk/share/html/Dashboards/Elements/ShowDashboards
rt/3.8/trunk/share/html/Dashboards/index.html
rt/3.8/trunk/share/html/Search/Chart
rt/3.8/trunk/share/html/Search/Chart.html
rt/3.8/trunk/share/html/Search/Elements/Chart
rt/3.8/trunk/share/html/Search/Elements/SelectChartType
rt/3.8/trunk/share/html/Ticket/Elements/ShowSummary
rt/3.8/trunk/share/html/Widgets/Form/Select
Log:
Several localization fixes.
RT-Ticket: #12490
RT-Status: resolved
RT-Update: correspond
Modified: rt/3.8/trunk/lib/RT/Config.pm
==============================================================================
--- rt/3.8/trunk/lib/RT/Config.pm (original)
+++ rt/3.8/trunk/lib/RT/Config.pm Fri Nov 7 18:40:19 2008
@@ -156,11 +156,11 @@
SortOrder => 2,
Widget => '/Widgets/Form/Select',
WidgetArguments => {
- Description => 'Username format',
+ Description => 'Username format', # loc
Values => [qw(concise verbose)],
ValuesLabel => {
- concise => 'Short usernames',
- verbose => 'Name and email address',
+ concise => 'Short usernames', # loc_left_pair
+ verbose => 'Name and email address', # loc_left_pair
},
},
},
Modified: rt/3.8/trunk/lib/RT/I18N/fr.po
==============================================================================
--- rt/3.8/trunk/lib/RT/I18N/fr.po (original)
+++ rt/3.8/trunk/lib/RT/I18N/fr.po Fri Nov 7 18:40:19 2008
@@ -6985,7 +6985,7 @@
#: share/html/Ticket/Elements/ShowUpdateStatus:51
#. (RT->Config->Get('WebPath') ."/Ticket/Display.html?id=". $Ticket->id. "#txn-".$txn->id, RT->Config->Get('WebPath') ."/Ticket/Display.html?id=". $Ticket->id ."&MarkAsSeen=1". "#txn-".$txn->id)
msgid "You can <a href=\"%1\">jump to the first unread message</a> or <a href=\"%2\">jump to the first unread message and mark all messages as seen</a>."
-msgstr "Vous pouvew <a href=\"%1\">aller au premier message non-lu</a> ou <a href=\"%2\">aller au premier message non-lu et marquer tous les messages comme lus</a>."
+msgstr "Vous pouvez <a href=\"%1\">aller au premier message non-lu</a> ou <a href=\"%2\">aller au premier message non-lu et marquer tous les messages comme lus</a>."
#: share/html/Prefs/Search.html:58
msgid "You can also edit the predefined search itself"
Modified: rt/3.8/trunk/share/html/Dashboards/Elements/ShowDashboards
==============================================================================
--- rt/3.8/trunk/share/html/Dashboards/Elements/ShowDashboards (original)
+++ rt/3.8/trunk/share/html/Dashboards/Elements/ShowDashboards Fri Nov 7 18:40:19 2008
@@ -45,11 +45,11 @@
%# those contributions and any derivatives thereof.
%#
%# END BPS TAGGED BLOCK }}}
-<&| /Widgets/TitleBox, title => loc("[_1] Dashboards", $Type) &>
+<&| /Widgets/TitleBox, title => $Title &>
<& SELF:table, %ARGS &>
</&>
<%ARGS>
-$Type => undef
+$Title => undef
</%ARGS>
<%METHOD table>
Modified: rt/3.8/trunk/share/html/Dashboards/index.html
==============================================================================
--- rt/3.8/trunk/share/html/Dashboards/index.html (original)
+++ rt/3.8/trunk/share/html/Dashboards/index.html Fri Nov 7 18:40:19 2008
@@ -53,18 +53,18 @@
<& /Elements/ListActions, actions => \@actions &>
<& /Dashboards/Elements/ShowDashboards,
- Type => "Personal",
+ Title => loc('Personnal Dashboards'),
Dashboards => [sort { $a->Id <=> $b->Id } @{ $dashboards->{personal} || [] }],
&>
<& /Dashboards/Elements/ShowDashboards,
- Type => "System",
+ Title => loc('System Dashboards'),
Dashboards => [sort { $a->Id <=> $b->Id } @{ $dashboards->{system} || [] }],
&>
% for my $group (sort keys %{ $dashboards->{group} || {} }) {
<& /Dashboards/Elements/ShowDashboards,
- Type => $group,
+ Title => loc('[_1] DashBoards', $group),
Dashboards => [sort { $a->Id <=> $b->Id } @{ $dashboards->{group}{$group} || [] }],
&>
% }
Modified: rt/3.8/trunk/share/html/Search/Chart
==============================================================================
--- rt/3.8/trunk/share/html/Search/Chart (original)
+++ rt/3.8/trunk/share/html/Search/Chart Fri Nov 7 18:40:19 2008
@@ -158,9 +158,10 @@
}
my %data;
-foreach my $key (@keys) { $data{$key} = shift @values; }
-my @sorted_keys = sort @keys;
-my @sorted_values = map { $data{$_}} @sorted_keys;
+my %loc_keys;
+foreach my $key (@keys) { $data{$key} = shift @values; $loc_keys{$key} = loc($key); }
+my @sorted_keys = map { $loc_keys{$_}} sort { $loc_keys{$a} cmp $loc_keys{$b} } keys %loc_keys;
+my @sorted_values = map { $data{$_}} sort { $loc_keys{$a} cmp $loc_keys{$b} } keys %loc_keys;
my $plot = $chart->plot( [ [@sorted_keys], [@sorted_values] ] ) or die $chart->error;
$m->comp( 'SELF:Plot', plot => $plot, %ARGS );
Modified: rt/3.8/trunk/share/html/Search/Chart.html
==============================================================================
--- rt/3.8/trunk/share/html/Search/Chart.html (original)
+++ rt/3.8/trunk/share/html/Search/Chart.html Fri Nov 7 18:40:19 2008
@@ -70,4 +70,4 @@
<& /Search/Elements/Chart, %ARGS &>
-<& /Widgets/SavedSearch:show, %ARGS, Action => 'Chart.html', self => $saved_search, Title => 'Saved charts' &>
+<& /Widgets/SavedSearch:show, %ARGS, Action => 'Chart.html', self => $saved_search, Title => loc('Saved charts') &>
Modified: rt/3.8/trunk/share/html/Search/Elements/Chart
==============================================================================
--- rt/3.8/trunk/share/html/Search/Elements/Chart (original)
+++ rt/3.8/trunk/share/html/Search/Elements/Chart Fri Nov 7 18:40:19 2008
@@ -94,9 +94,10 @@
}
my %data;
-foreach my $key (@keys) { $data{$key} = shift @values; }
-my @sorted_keys = sort @keys;
-my @sorted_values = map { $data{$_}} @sorted_keys;
+my %loc_keys;
+foreach my $key (@keys) { $data{$key} = shift @values; $loc_keys{$key} = loc($key); }
+my @sorted_keys = map { $loc_keys{$_}} sort { $loc_keys{$a} cmp $loc_keys{$b} } keys %loc_keys;
+my @sorted_values = map { $data{$_}} sort { $loc_keys{$a} cmp $loc_keys{$b} } keys %loc_keys;
my $query_string = $m->comp('/Elements/QueryString', %ARGS);
@@ -112,7 +113,7 @@
<table class="collection-as-table">
<tr>
-<th class="collection-as-table"><% $tix->Label($PrimaryGroupBy) %>
+<th class="collection-as-table"><% loc($tix->Label($PrimaryGroupBy)) %>
</th>
<th class="collection-as-table"><&|/l&>Tickets</&>
</th>
Modified: rt/3.8/trunk/share/html/Search/Elements/SelectChartType
==============================================================================
--- rt/3.8/trunk/share/html/Search/Elements/SelectChartType (original)
+++ rt/3.8/trunk/share/html/Search/Elements/SelectChartType Fri Nov 7 18:40:19 2008
@@ -51,6 +51,8 @@
</%args>
<select id="<%$Name%>" name="<%$Name%>">
% foreach my $option qw(bar pie) {
+% # 'bar' # loc
+% # 'pie' # loc
<option value="<%$option%>"<% $option eq $Default ? qq[ selected="selected"] : '' |n %>><%loc($option)%></option>
% }
</select>
Modified: rt/3.8/trunk/share/html/Ticket/Elements/ShowSummary
==============================================================================
--- rt/3.8/trunk/share/html/Ticket/Elements/ShowSummary (original)
+++ rt/3.8/trunk/share/html/Ticket/Elements/ShowSummary Fri Nov 7 18:40:19 2008
@@ -83,7 +83,7 @@
<td>
<form action="<%RT->Config->Get('WebPath')%>/Ticket/Display.html" method="post">
<& /Ticket/Elements/Reminders, Ticket => $Ticket, ShowCompleted => 0 &>
- <div align="right"><input type="submit" class="button" value="Save" /></div>
+ <div align="right"><input type="submit" class="button" value="<&|/l&>Save</&>" /></div>
</form>
</td>
</tr>
Modified: rt/3.8/trunk/share/html/Widgets/Form/Select
==============================================================================
--- rt/3.8/trunk/share/html/Widgets/Form/Select (original)
+++ rt/3.8/trunk/share/html/Widgets/Form/Select Fri Nov 7 18:40:19 2008
@@ -71,7 +71,7 @@
$Default => 1,
@DefaultValue => (),
-$DefaultLabel => loc('Use system default ([_1])', join ', ', @DefaultValue),
+$DefaultLabel => undef,
$Alternative => 0,
$AlternativeLabel => loc('other...'),
@@ -89,7 +89,7 @@
% foreach my $v( @Values ) {
% my $selected = '';
% $selected = 'selected="selected"' if delete $CurrentValue{ $v };
-<option value="<% $v %>" <% $selected |n %>><% $ValuesLabel{ $v } || $v %></option>
+<option value="<% $v %>" <% $selected |n %>><% loc($ValuesLabel{ $v } || $v) %></option>
% }
% if ( $Alternative ) {
@@ -116,6 +116,9 @@
@Values = keys %ValuesLabel;
}
}
+unless (defined $DefaultLabel ) {
+ $DefaultLabel = loc('Use system default ([_1])', join ', ', map{ loc($ValuesLabel{$_} || $_) } @DefaultValue);
+}
</%INIT>
</%METHOD>
More information about the Rt-commit
mailing list