[Rt-commit] r15495 - in rt/3.8/trunk: lib/RT share/html/Elements/RT__Ticket share/html/Install
ruz at bestpractical.com
ruz at bestpractical.com
Tue Aug 26 13:22:01 EDT 2008
Author: ruz
Date: Tue Aug 26 13:22:00 2008
New Revision: 15495
Modified:
rt/3.8/trunk/lib/RT/Ticket_Overlay.pm
rt/3.8/trunk/share/html/Elements/RT__Ticket/ColumnMap
rt/3.8/trunk/share/html/Install/Basics.html
rt/3.8/trunk/share/html/Install/DatabaseDetails.html
rt/3.8/trunk/share/html/Install/DatabaseType.html
rt/3.8/trunk/share/html/Install/Finish.html
rt/3.8/trunk/share/html/Install/Global.html
rt/3.8/trunk/share/html/Install/Initialize.html
rt/3.8/trunk/share/html/Install/Sendmail.html
rt/3.8/trunk/share/html/Widgets/SavedSearch
Log:
* refactor localized strings with trailing and heading space characters
Modified: rt/3.8/trunk/lib/RT/Ticket_Overlay.pm
==============================================================================
--- rt/3.8/trunk/lib/RT/Ticket_Overlay.pm (original)
+++ rt/3.8/trunk/lib/RT/Ticket_Overlay.pm Tue Aug 26 13:22:00 2008
@@ -2765,7 +2765,7 @@
my ( $del_id, $del_msg ) = $self->OwnerGroup->MembersObj->First->Delete();
unless ($del_id) {
$RT::Handle->Rollback();
- return ( 0, $self->loc("Could not change owner. ") . $del_msg );
+ return ( 0, $self->loc("Could not change owner: [_1]", $del_msg) );
}
my ( $add_id, $add_msg ) = $self->OwnerGroup->_AddMember(
@@ -2773,7 +2773,7 @@
InsideTransaction => 1 );
unless ($add_id) {
$RT::Handle->Rollback();
- return ( 0, $self->loc("Could not change owner. ") . $add_msg );
+ return ( 0, $self->loc("Could not change owner: [_1]", $add_msg ) );
}
# We call set twice with slightly different arguments, so
@@ -2790,7 +2790,7 @@
unless ($val) {
$RT::Handle->Rollback;
- return ( 0, $self->loc("Could not change owner. ") . $msg );
+ return ( 0, $self->loc("Could not change owner: [_1]", $msg) );
}
($val, $msg) = $self->_NewTransaction(
Modified: rt/3.8/trunk/share/html/Elements/RT__Ticket/ColumnMap
==============================================================================
--- rt/3.8/trunk/share/html/Elements/RT__Ticket/ColumnMap (original)
+++ rt/3.8/trunk/share/html/Elements/RT__Ticket/ColumnMap Tue Aug 26 13:22:00 2008
@@ -273,10 +273,10 @@
my $name = $t->OwnerObj->Name;
my %key = RT::Crypt::GnuPG::GetKeyInfo($t->OwnerObj->EmailAddress);
if (!defined $key{'info'}) {
- $name .= loc(" (no pubkey!)");
+ $name .= ' '. loc("(no pubkey!)");
}
elsif ($key{'info'}{'TrustLevel'} == 0) {
- $name .= loc(" (untrusted!)");
+ $name .= ' '. loc("(untrusted!)");
}
return $name;
Modified: rt/3.8/trunk/share/html/Install/Basics.html
==============================================================================
--- rt/3.8/trunk/share/html/Install/Basics.html (original)
+++ rt/3.8/trunk/share/html/Install/Basics.html Tue Aug 26 13:22:00 2008
@@ -45,7 +45,7 @@
%# those contributions and any derivatives thereof.
%#
%# END BPS TAGGED BLOCK }}}
-<&| Elements/Wrapper, Title => loc('Step [_1] of [_2]: ', 3, 7) . loc('Customize Basics') &>
+<&| Elements/Wrapper, Title => loc('Step [_1] of [_2]', 3, 7) .': '. loc('Customize Basics') &>
<& Elements/Errors, Errors => \@errors &>
@@ -58,7 +58,10 @@
CurrentValue => RT::Installer->CurrentValues(@Types) &>
<input type="hidden" name="Run" value="1">
-<& /Elements/Submit, Label => loc('Next: ') . loc('Customize Email Configuration'),Back => 1, BackLabel => loc('Back: ' ) . loc( 'Customize Database Details') &>
+<& /Elements/Submit,
+ Label => loc('Next') .': '. loc('Customize Email Configuration'),
+ Back => 1, BackLabel => loc('Back') .': '. loc('Customize Database Details'),
+&>
</form>
</&>
Modified: rt/3.8/trunk/share/html/Install/DatabaseDetails.html
==============================================================================
--- rt/3.8/trunk/share/html/Install/DatabaseDetails.html (original)
+++ rt/3.8/trunk/share/html/Install/DatabaseDetails.html Tue Aug 26 13:22:00 2008
@@ -45,7 +45,7 @@
%# those contributions and any derivatives thereof.
%#
%# END BPS TAGGED BLOCK }}}
-<&| Elements/Wrapper, Title => loc('Step [_1] of [_2]: ', 2, 7 ) . loc('Check your database credentials') &>
+<&| Elements/Wrapper, Title => loc('Step [_1] of [_2]', 2, 7 ) .': '. loc('Check your database credentials') &>
% if ( @errors ) {
<& Elements/Errors, Errors => \@errors &>
@@ -68,9 +68,11 @@
<form method="post">
<input type="hidden" name="Run" value="1">
% if ( @results && !@errors ) {
-<& /Elements/Submit, Label => loc('Next: ') . loc('Customize Basics'),
-Back => 1, BackLabel => loc('Back: ') . loc('Select Database Type'),
-Name => 'Next' &>
+<& /Elements/Submit,
+ Label => loc('Next') .': '. loc('Customize Basics'),
+ Back => 1, BackLabel => loc('Back') .': '. loc('Select Database Type'),
+ Name => 'Next',
+&>
% } else {
<& /Widgets/BulkEdit, Types => \@Types, Meta => $RT::Installer->{Meta},
CurrentValue => { %{RT::Installer->CurrentValues(@Types)},
@@ -82,8 +84,9 @@
: '' ),
}
&>
-<& /Elements/Submit, Label => loc('Check Database Connectivity'),
-Back => 1, BackLabel => loc('Back: ') . loc('Select Database Type')
+<& /Elements/Submit,
+ Label => loc('Check Database Connectivity'),
+ Back => 1, BackLabel => loc('Back') .': '. loc('Select Database Type'),
&>
% }
Modified: rt/3.8/trunk/share/html/Install/DatabaseType.html
==============================================================================
--- rt/3.8/trunk/share/html/Install/DatabaseType.html (original)
+++ rt/3.8/trunk/share/html/Install/DatabaseType.html Tue Aug 26 13:22:00 2008
@@ -45,7 +45,7 @@
%# those contributions and any derivatives thereof.
%#
%# END BPS TAGGED BLOCK }}}
-<&|Elements/Wrapper, Title => loc('Step [_1] of [_2]: ', 1, 7 ) . loc('Choose a database engine') &>
+<&|Elements/Wrapper, Title => loc('Step [_1] of [_2]', 1, 7 ) .': '. loc('Choose a database engine') &>
<div class="intro">
<p>
@@ -67,7 +67,7 @@
CurrentValue => RT::Installer->CurrentValues(@Types) &>
<input type="hidden" name="Run" value="1">
-<& /Elements/Submit, Label => loc('Next: ') . loc( 'Check your database credentials') &>
+<& /Elements/Submit, Label => loc('Next') .': '. loc( 'Check your database credentials') &>
</form>
</&>
<%init>
Modified: rt/3.8/trunk/share/html/Install/Finish.html
==============================================================================
--- rt/3.8/trunk/share/html/Install/Finish.html (original)
+++ rt/3.8/trunk/share/html/Install/Finish.html Tue Aug 26 13:22:00 2008
@@ -45,7 +45,7 @@
%# those contributions and any derivatives thereof.
%#
%# END BPS TAGGED BLOCK }}}
-<&| Elements/Wrapper, Title => loc('Step [_1] of [_2]: ', 7, 7) . loc('Finish') &>
+<&| Elements/Wrapper, Title => loc('Step [_1] of [_2]', 7, 7) .': '. loc('Finish') &>
<div class="intro">
<p>
Modified: rt/3.8/trunk/share/html/Install/Global.html
==============================================================================
--- rt/3.8/trunk/share/html/Install/Global.html (original)
+++ rt/3.8/trunk/share/html/Install/Global.html Tue Aug 26 13:22:00 2008
@@ -45,7 +45,7 @@
%# those contributions and any derivatives thereof.
%#
%# END BPS TAGGED BLOCK }}}
-<&| Elements/Wrapper, Title => loc('Step [_1] of [_2]: ', 5, 7 ) . loc('Customize Email Addresses') &>
+<&| Elements/Wrapper, Title => loc('Step [_1] of [_2]', 5, 7 ) .': '. loc('Customize Email Addresses') &>
<& Elements/Errors, Errors => \@errors &>
@@ -60,9 +60,11 @@
&>
<input type="hidden" name="Run" value="1">
-<& /Elements/Submit, Label => $RT::Installer->{DatabaseAction} eq 'none' ?
-loc('Next: ') . loc('Finish') : loc('Next: ') . loc( 'Initialize Database'),
- Back => 1, BackLabel => loc('Back: ' ) . loc('Customize Email Configuration') &>
+<& /Elements/Submit,
+ Label => $RT::Installer->{DatabaseAction} eq 'none' ?
+ loc('Next') .': '. loc('Finish') : loc('Next') .': '. loc('Initialize Database'),
+ Back => 1, BackLabel => loc('Back') .': '. loc('Customize Email Configuration'),
+&>
</form>
</&>
<%init>
Modified: rt/3.8/trunk/share/html/Install/Initialize.html
==============================================================================
--- rt/3.8/trunk/share/html/Install/Initialize.html (original)
+++ rt/3.8/trunk/share/html/Install/Initialize.html Tue Aug 26 13:22:00 2008
@@ -45,7 +45,7 @@
%# those contributions and any derivatives thereof.
%#
%# END BPS TAGGED BLOCK }}}
-<&|Elements/Wrapper, Title => loc('Step [_1] of [_2]: ', 6, 7) . loc('Initialize Database') &>
+<&|Elements/Wrapper, Title => loc('Step [_1] of [_2]', 6, 7) .': '. loc('Initialize Database') &>
<& Elements/Errors, Errors => \@errors &>
@@ -57,8 +57,10 @@
<form method="post">
<input type="hidden" name="Run" value="1">
-<& /Elements/Submit, Label => loc('Initialize Database'), Back => 1,
- BackLabel => loc('Back: ') . loc('Customize Global') &>
+<& /Elements/Submit,
+ Label => loc('Initialize Database'),
+ Back => 1, BackLabel => loc('Back') .': '. loc('Customize Global'),
+&>
</form>
</&>
<%init>
Modified: rt/3.8/trunk/share/html/Install/Sendmail.html
==============================================================================
--- rt/3.8/trunk/share/html/Install/Sendmail.html (original)
+++ rt/3.8/trunk/share/html/Install/Sendmail.html Tue Aug 26 13:22:00 2008
@@ -45,7 +45,7 @@
%# those contributions and any derivatives thereof.
%#
%# END BPS TAGGED BLOCK }}}
-<&|Elements/Wrapper, Title => loc('Step [_1] of [_2]: ', 4, 7 ) . loc('Email Configuration') &>
+<&|Elements/Wrapper, Title => loc('Step [_1] of [_2]', 4, 7 ) .': '. loc('Email Configuration') &>
<& Elements/Errors, Errors => \@errors &>
@@ -59,8 +59,10 @@
&>
<input type="hidden" name="Run" value="1">
-<& /Elements/Submit, Label => loc('Next: ') . loc( 'Customize Global Defaults'),
- Back => 1, BackLabel => loc('Back: ' ) . loc('Customize Basics') &>
+<& /Elements/Submit,
+ Label => loc('Next') .': '. loc('Customize Global Defaults'),
+ Back => 1, BackLabel => loc('Back' ) .': '. loc('Customize Basics'),
+&>
</form>
</&>
<%init>
Modified: rt/3.8/trunk/share/html/Widgets/SavedSearch
==============================================================================
--- rt/3.8/trunk/share/html/Widgets/SavedSearch (original)
+++ rt/3.8/trunk/share/html/Widgets/SavedSearch Tue Aug 26 13:22:00 2008
@@ -91,7 +91,7 @@
if ( my $search = $self->{CurrentSearch}{Object} ) {
# rename
$search->SetDescription( $args->{SavedSearchDescription} );
- push @actions, loc($self->{SearchType}).loc( ' [_1] renamed to [_2].', $self->{CurrentSearch}{Description}, $args->{SavedSearchDescription} );
+ push @actions, loc( '[_1] [_2] renamed to [_3].', loc($self->{SearchType}), $self->{CurrentSearch}{Description}, $args->{SavedSearchDescription} );
}
else {
# new saved search
@@ -104,7 +104,7 @@
);
if ($ok) {
$self->{CurrentSearch}{Object} = $saved_search->{Attribute};
- push @actions, loc($self->{SearchType}).loc( ' [_1] saved.', $args->{SavedSearchDescription} );
+ push @actions, loc( '[_1] [_2] saved.', loc($self->{SearchType}), $args->{SavedSearchDescription} );
} else {
push @actions,
[ loc("Can't save [_1]", loc($self->{SearchType})) . ': ' . loc($search_msg), 0 ];
@@ -114,7 +114,7 @@
if ( $args->{SavedSearchDelete} && $self->{CurrentSearch}{Object} ) {
my ($ok, $msg) = $self->{CurrentSearch}{Object}->Delete;
- push @actions, $ok ? loc($self->{SearchType}).loc( ' [_1] deleted.', $self->{CurrentSearch}{Object}->Description ) : $msg;
+ push @actions, $ok ? loc( '[_1] [_2] deleted.', loc($self->{SearchType}), $self->{CurrentSearch}{Object}->Description ) : $msg;
delete $self->{CurrentSearch}{Object};
delete $self->{SearchId};
More information about the Rt-commit
mailing list