[Rt-commit] r14148 - in rt/branches/3.999-DANGEROUS: . lib/RT sbin share/html/Admin/Groups share/html/Dashboards share/html/Dashboards/Elements share/html/Elements/RT__Scrip share/html/Ticket/Graphs share/html/Widgets/Form
sunnavy at bestpractical.com
sunnavy at bestpractical.com
Wed Jul 16 04:20:32 EDT 2008
Author: sunnavy
Date: Wed Jul 16 04:20:32 2008
New Revision: 14148
Modified:
rt/branches/3.999-DANGEROUS/ (props changed)
rt/branches/3.999-DANGEROUS/lib/RT/Condition.pm
rt/branches/3.999-DANGEROUS/lib/RT/ScripAction.pm
rt/branches/3.999-DANGEROUS/lib/RT/Search.pm
rt/branches/3.999-DANGEROUS/lib/RT/SharedSetting.pm
rt/branches/3.999-DANGEROUS/sbin/rt-email-dashboards.in
rt/branches/3.999-DANGEROUS/sbin/rt-email-digest.in
rt/branches/3.999-DANGEROUS/share/html/Admin/Groups/Members.html
rt/branches/3.999-DANGEROUS/share/html/Dashboards/Elements/SelectPrivacy
rt/branches/3.999-DANGEROUS/share/html/Dashboards/Elements/ShowDashboards
rt/branches/3.999-DANGEROUS/share/html/Dashboards/Elements/ShowSubscription
rt/branches/3.999-DANGEROUS/share/html/Dashboards/Modify.html
rt/branches/3.999-DANGEROUS/share/html/Dashboards/Queries.html
rt/branches/3.999-DANGEROUS/share/html/Dashboards/Render.html
rt/branches/3.999-DANGEROUS/share/html/Dashboards/Subscription.html
rt/branches/3.999-DANGEROUS/share/html/Dashboards/index.html
rt/branches/3.999-DANGEROUS/share/html/Elements/RT__Scrip/ColumnMap
rt/branches/3.999-DANGEROUS/share/html/Install/Basics.html
rt/branches/3.999-DANGEROUS/share/html/Install/DatabaseDetails.html
rt/branches/3.999-DANGEROUS/share/html/Install/DatabaseType.html
rt/branches/3.999-DANGEROUS/share/html/Install/Finish.html
rt/branches/3.999-DANGEROUS/share/html/Install/Global.html
rt/branches/3.999-DANGEROUS/share/html/Install/Initialize.html
rt/branches/3.999-DANGEROUS/share/html/Install/Sendmail.html
rt/branches/3.999-DANGEROUS/share/html/Install/index.html
rt/branches/3.999-DANGEROUS/share/html/Ticket/Graphs/index.html
rt/branches/3.999-DANGEROUS/share/html/Widgets/Form/String
Log:
r14508 at sunnavys-mb: sunnavy | 2008-07-16 15:19:09 +0800
[_1] => %1
Modified: rt/branches/3.999-DANGEROUS/lib/RT/Condition.pm
==============================================================================
--- rt/branches/3.999-DANGEROUS/lib/RT/Condition.pm (original)
+++ rt/branches/3.999-DANGEROUS/lib/RT/Condition.pm Wed Jul 16 04:20:32 2008
@@ -201,7 +201,7 @@
# {{{ sub Describe
sub describe {
my $self = shift;
- return ( $self->loc( "No description for [_1]", ref $self ) );
+ return ( $self->loc( "No description for %1", ref $self ) );
}
# }}}
Modified: rt/branches/3.999-DANGEROUS/lib/RT/ScripAction.pm
==============================================================================
--- rt/branches/3.999-DANGEROUS/lib/RT/ScripAction.pm (original)
+++ rt/branches/3.999-DANGEROUS/lib/RT/ScripAction.pm Wed Jul 16 04:20:32 2008
@@ -190,7 +190,7 @@
# {{{ sub Describe
sub Describe {
my $self = shift;
- return $self->loc( "No description for [_1]", ref $self );
+ return $self->loc( "No description for %1", ref $self );
}
# }}}
Modified: rt/branches/3.999-DANGEROUS/lib/RT/Search.pm
==============================================================================
--- rt/branches/3.999-DANGEROUS/lib/RT/Search.pm (original)
+++ rt/branches/3.999-DANGEROUS/lib/RT/Search.pm Wed Jul 16 04:20:32 2008
@@ -132,7 +132,7 @@
# {{{ sub describe
sub describe {
my $self = shift;
- return ( $self->loc( "No description for [_1]", ref $self ) );
+ return ( $self->loc( "No description for %1", ref $self ) );
}
# }}}
Modified: rt/branches/3.999-DANGEROUS/lib/RT/SharedSetting.pm
==============================================================================
--- rt/branches/3.999-DANGEROUS/lib/RT/SharedSetting.pm (original)
+++ rt/branches/3.999-DANGEROUS/lib/RT/SharedSetting.pm Wed Jul 16 04:20:32 2008
@@ -124,7 +124,7 @@
return (
0,
$self->loc(
- "Failed to load [_1] [_2]", $self->object_name, $id
+ "Failed to load %1 %2", $self->object_name, $id
)
);
}
@@ -132,7 +132,7 @@
else {
Jifty->log->warn( "Could not load object $privacy when loading "
. $self->object_name );
- return ( 0, $self->loc( "Could not load object for [_1]", $privacy ) );
+ return ( 0, $self->loc( "Could not load object for %1", $privacy ) );
}
}
@@ -155,14 +155,14 @@
return (
0,
$self->loc(
- "Failed to load [_1] [_2]: [_3]", $self->object_name,
+ "Failed to load %1 %2: %3", $self->object_name,
$id, $msg
)
);
}
my $privacy = $self->_build_privacy( $attr->object_type, $attr->object_id );
- return ( 0, $self->loc( "Bad privacy for attribute [_1]", $id ) )
+ return ( 0, $self->loc( "Bad privacy for attribute %1", $id ) )
if !$privacy;
return $self->load( $privacy, $id );
@@ -201,7 +201,7 @@
my $privacy = $args{'privacy'};
my $name = $args{'name'}, my $object = $self->_get_object($privacy);
- return ( 0, $self->loc( "Failed to load object for [_1]", $privacy ) )
+ return ( 0, $self->loc( "Failed to load object for %1", $privacy ) )
unless $object;
return ( 0, $self->loc("Permission denied") )
@@ -218,7 +218,7 @@
else {
Jifty->log->error( $self->object_name . " save failure: $att_msg" );
return ( 0,
- $self->loc( "Failed to create [_1] attribute", $self->object_name )
+ $self->loc( "Failed to create %1 attribute", $self->object_name )
);
}
}
@@ -243,10 +243,10 @@
my $self = shift;
my %args = @_;
- return ( 0, $self->loc( "No [_1] loaded", $self->object_name ) )
+ return ( 0, $self->loc( "No %1 loaded", $self->object_name ) )
unless $self->id;
return ( 0,
- $self->loc( "Could not load [_1] attribute", $self->object_name ) )
+ $self->loc( "Could not load %1 attribute", $self->object_name ) )
unless $self->{'attribute'}->id;
return ( 0, $self->loc("Permission denied") )
@@ -257,17 +257,17 @@
return (
1,
$self->loc(
- "[_1] update: Nothing changed",
+ "%1 update: Nothing changed",
ucfirst( $self->object_name )
)
) if !defined $msg;
# prevent useless warnings
- return ( 1, $self->loc("[_1] updated"), ucfirst( $self->object_name ) )
+ return ( 1, $self->loc("%1 updated"), ucfirst( $self->object_name ) )
if $msg =~ /That is already the current value/;
return ( $status,
- $self->loc( "[_1] update: [_2]", ucfirst( $self->object_name ), $msg ) );
+ $self->loc( "%1 update: %2", ucfirst( $self->object_name ), $msg ) );
}
=head2 update_attribute
Modified: rt/branches/3.999-DANGEROUS/sbin/rt-email-dashboards.in
==============================================================================
--- rt/branches/3.999-DANGEROUS/sbin/rt-email-dashboards.in (original)
+++ rt/branches/3.999-DANGEROUS/sbin/rt-email-dashboards.in Wed Jul 16 04:20:32 2008
@@ -120,10 +120,10 @@
sub warning { Jifty->log->warn(loc(@_)); verbose(@_); 1 }
my $now = $opts{epoch} || time;
-verbose "Using time [_1]", scalar localtime($now);
+verbose "Using time %1", scalar localtime($now);
my $from = get_from();
-debug "Sending email from [_1]", $from;
+debug "Sending email from %1", $from;
# look through each user for her subscriptions
my $Users = RT::Model::UserCollection->new(RT->system_user);
@@ -146,7 +146,7 @@
my ($hour, $dow, $dom) = hour_dow_dom_in($user->Timezone || RT->config->get('Timezone'));
$hour .= ':00';
- debug "Checking [_1]'s subscriptions: hour [_2], dow [_3], dom [_4]",
+ debug "Checking %1's subscriptions: hour %2, dow %3, dom %4",
$user->name, $hour, $dow, $dom;
my $currentuser = RT::CurrentUser->new;
@@ -157,7 +157,7 @@
for my $subscription ($user->attributes->Named('Subscription')) {
if (!$opts{all}) {
- debug "Checking against subscription with frequency [_1], hour [_2], dow [_3], dom [_4]", $subscription->SubValue('Frequency'), $subscription->SubValue('Hour'), $subscription->SubValue('Dow'), $subscription->SubValue('Dom');
+ debug "Checking against subscription with frequency %1, hour %2, dow %3, dom %4", $subscription->SubValue('Frequency'), $subscription->SubValue('Hour'), $subscription->SubValue('Dow'), $subscription->SubValue('Dom');
next if $subscription->SubValue('Frequency') eq 'never';
@@ -191,7 +191,7 @@
# failed to load dashboard. perhaps it was deleted or it changed privacy
if (!$ok) {
- warning "Unable to load dashboard [_1] of subscription [_2] for user [_3]: [_4]",
+ warning "Unable to load dashboard %1 of subscription %2 for user %3: %4",
$subscription->SubValue('DashboardId'),
$subscription->Id,
$currentuser->name,
@@ -210,20 +210,20 @@
if ($ok) {
my ($deleted, $msg) = $subscription->Delete();
if ($deleted) {
- verbose("Deleted an obsolete subscription: [_1]", $msg);
+ verbose("Deleted an obsolete subscription: %1", $msg);
}
else {
- warning("Unable to delete an obsolete subscription: [_1]", $msg);
+ warning("Unable to delete an obsolete subscription: %1", $msg);
}
}
else {
- warning("Unable to notify [_1] of an obsolete subscription", $currentuser->name);
+ warning("Unable to notify %1 of an obsolete subscription", $currentuser->name);
}
return;
}
- verbose 'Creating dashboard "[_1]" for user "[_2]":',
+ verbose 'Creating dashboard "%1" for user "%2":',
$dashboard->name,
$currentuser->name;
@@ -246,7 +246,7 @@
$contents =~ s/$_//g;
}
- debug "Got [_1] characters of output.", length $contents;
+ debug "Got %1 characters of output.", length $contents;
$contents = HTML::RewriteAttributes::Links->rewrite(
$contents,
@@ -259,7 +259,7 @@
sub email_dashboard {
my ($currentuser, $dashboard, $subscription, $content) = @_;
- verbose 'Sending dashboard "[_1]" to user [_2] <[_3]>',
+ verbose 'Sending dashboard "%1" to user %2 <%3>',
$dashboard->name,
$currentuser->name,
email_of($currentuser);
@@ -277,11 +277,11 @@
Entity => $entity,
);
- debug "Done sending dashboard to [_1] <[_2]>",
+ debug "Done sending dashboard to %1 <%2>",
$currentuser->name, email_of($currentuser)
and return if $ok;
- error 'Failed to email dashboard to user [_1] <[_2]>',
+ error 'Failed to email dashboard to user %1 <%2>',
$currentuser->name, email_of($currentuser);
}
@@ -404,7 +404,7 @@
my $uri = URI->new(shift);
my ($content, $filename, $mimetype, $encoding);
- verbose "Getting resource [_1]", $uri;
+ verbose "Getting resource %1", $uri;
# strip out the equivalent of WebURL, so we start at the correct /
my $path = $uri->path;
@@ -437,7 +437,7 @@
}
}
- debug "Running component '[_1]'", $path;
+ debug "Running component '%1'", $path;
$content = run_component($path, %args);
# guess at the filename from the component name
@@ -458,7 +458,7 @@
$mimetype ||= 'application/octet-stream';
$encoding ||= 'base64';
- debug "Resource [_1]: length=[_2] filename='[_3]' mimetype='[_4]', encoding='[_5]'",
+ debug "Resource %1: length=%2 filename='%3' mimetype='%4', encoding='%5'",
$uri,
length($content),
$filename,
Modified: rt/branches/3.999-DANGEROUS/sbin/rt-email-digest.in
==============================================================================
--- rt/branches/3.999-DANGEROUS/sbin/rt-email-digest.in (original)
+++ rt/branches/3.999-DANGEROUS/sbin/rt-email-digest.in Wed Jul 16 04:20:32 2008
@@ -87,7 +87,7 @@
my ($error) = @_;
print loc("Usage: ") . "$0 -m (daily|weekly) [--print] [--help]\n";
print loc(
- "[_1] is a utility, meant to be run from cron, that dispatches all deferred RT notifications as a per-user digest.",
+ "%1 is a utility, meant to be run from cron, that dispatches all deferred RT notifications as a per-user digest.",
$0
) . "\n";
print "\n\t-m, --mode\t"
Modified: rt/branches/3.999-DANGEROUS/share/html/Admin/Groups/Members.html
==============================================================================
--- rt/branches/3.999-DANGEROUS/share/html/Admin/Groups/Members.html (original)
+++ rt/branches/3.999-DANGEROUS/share/html/Admin/Groups/Members.html Wed Jul 16 04:20:32 2008
@@ -52,7 +52,7 @@
<& /Elements/ListActions, actions => \@results &>
-<&| /Widgets/TitleBox, title => _('Editing membership for group [_1]', $Group->name) &>
+<&| /Widgets/TitleBox, title => _('Editing membership for group %1', $Group->name) &>
<form action="<% RT->config->get('WebPath') %>/Admin/Groups/Members.html" method="post">
<input type="hidden" class="hidden" name="id" value="<%$Group->id%>" />
Modified: rt/branches/3.999-DANGEROUS/share/html/Dashboards/Elements/SelectPrivacy
==============================================================================
--- rt/branches/3.999-DANGEROUS/share/html/Dashboards/Elements/SelectPrivacy (original)
+++ rt/branches/3.999-DANGEROUS/share/html/Dashboards/Elements/SelectPrivacy Wed Jul 16 04:20:32 2008
@@ -58,7 +58,7 @@
% if (ref($object) eq 'RT::Model::User' && $object->id == Jifty->web->current_user->Id) {
<option <%$selected|n%> value="<%$privacy%>"><&|/l&>My dashboards</&></option>
% } else {
-<option <%$selected|n%> value="<%$privacy%>"><&|/l, $object->name&>[_1]'s dashboards</&></option>
+<option <%$selected|n%> value="<%$privacy%>"><&|/l, $object->name&>%1's dashboards</&></option>
% }
% }
</select>
Modified: rt/branches/3.999-DANGEROUS/share/html/Dashboards/Elements/ShowDashboards
==============================================================================
--- rt/branches/3.999-DANGEROUS/share/html/Dashboards/Elements/ShowDashboards (original)
+++ rt/branches/3.999-DANGEROUS/share/html/Dashboards/Elements/ShowDashboards Wed Jul 16 04:20:32 2008
@@ -45,7 +45,7 @@
%# those contributions and any derivatives thereof.
%#
%# END BPS TAGGED BLOCK }}}
-<&| /Widgets/TitleBox, title => loc("[_1] Dashboards", $Type) &>
+<&| /Widgets/TitleBox, title => loc("%1 Dashboards", $Type) &>
<& SELF:table, %ARGS &>
</&>
<%ARGS>
Modified: rt/branches/3.999-DANGEROUS/share/html/Dashboards/Elements/ShowSubscription
==============================================================================
--- rt/branches/3.999-DANGEROUS/share/html/Dashboards/Elements/ShowSubscription (original)
+++ rt/branches/3.999-DANGEROUS/share/html/Dashboards/Elements/ShowSubscription Wed Jul 16 04:20:32 2008
@@ -63,13 +63,13 @@
if ($freq eq 'weekly') {
my $day = (qw/Monday Tuesday Wednesday Thursday Friday Saturday Sunday/)[$Subscription->SubValue('Dow')];
- $frequency = loc("[_1] (on [_2]) at [_3]", $freq, $day, $hour);
+ $frequency = loc("%1 (on %2) at %3", $freq, $day, $hour);
}
elsif ($freq eq 'monthly') {
- $frequency = loc("[_1] (day [_2]) at [_3]", $freq, $Subscription->SubValue('Dom'), $hour);
+ $frequency = loc("%1 (day %2) at %3", $freq, $Subscription->SubValue('Dom'), $hour);
}
elsif ($freq eq 'daily') {
- $frequency = loc("[_1] at [_2]", $freq, $hour);
+ $frequency = loc("%1 at %2", $freq, $hour);
}
}
</%INIT>
Modified: rt/branches/3.999-DANGEROUS/share/html/Dashboards/Modify.html
==============================================================================
--- rt/branches/3.999-DANGEROUS/share/html/Dashboards/Modify.html (original)
+++ rt/branches/3.999-DANGEROUS/share/html/Dashboards/Modify.html Wed Jul 16 04:20:32 2008
@@ -107,7 +107,7 @@
);
if (!$val) {
- abort(loc("Dashboard could not be created: [_1]", $msg));
+ abort(loc("Dashboard could not be created: %1", $msg));
}
push @results, $msg;
@@ -119,7 +119,7 @@
}
if ($id) {
- $title = loc("Modify the dashboard [_1]", $Dashboard->name);
+ $title = loc("Modify the dashboard %1", $Dashboard->name);
$current_subtab = 'Dashboards/Modify.html?id=' . $id;
}
# If the create failed
@@ -138,7 +138,7 @@
push @results, loc("Dashboard updated");
}
else {
- push @results, loc("Dashboard could not be updated: [_1]", $msg);
+ push @results, loc("Dashboard could not be updated: %1", $msg);
}
}
@@ -147,7 +147,7 @@
if (!$Create && !$tried_create && $id && $ARGS{'Delete'}) {
my ($ok, $msg) = $Dashboard->Delete();
- $ok || abort(loc("Couldn't delete dashboard [_1]: [_2]", $id, $msg));
+ $ok || abort(loc("Couldn't delete dashboard %1: %2", $id, $msg));
# put the user back into a useful place with a message
RT::Interface::Web::redirect(RT->config->get('WebURL')."Dashboards/index.html?Deleted=$id");
Modified: rt/branches/3.999-DANGEROUS/share/html/Dashboards/Queries.html
==============================================================================
--- rt/branches/3.999-DANGEROUS/share/html/Dashboards/Queries.html (original)
+++ rt/branches/3.999-DANGEROUS/share/html/Dashboards/Queries.html Wed Jul 16 04:20:32 2008
@@ -84,8 +84,8 @@
use RT::Dashboard;
my $Dashboard = new RT::Dashboard( current_user => Jifty->web->current_user );
my ($ok, $msg) = $Dashboard->LoadById($id);
-$ok || abort(loc("Couldn't load dashboard [_1]: [_2]", $id, $msg));
-my $title = loc("Modify the queries of dashboard [_1]", $Dashboard->name);
+$ok || abort(loc("Couldn't load dashboard %1: %2", $id, $msg));
+my $title = loc("Modify the queries of dashboard %1", $Dashboard->name);
my %desc_of;
my @items;
@@ -140,7 +140,7 @@
push @results, loc("Dashboard updated");
}
else {
- push @results, loc("Dashboard could not be updated: [_1]", $msg);
+ push @results, loc("Dashboard could not be updated: %1", $msg);
}
},
);
Modified: rt/branches/3.999-DANGEROUS/share/html/Dashboards/Render.html
==============================================================================
--- rt/branches/3.999-DANGEROUS/share/html/Dashboards/Render.html (original)
+++ rt/branches/3.999-DANGEROUS/share/html/Dashboards/Render.html Wed Jul 16 04:20:32 2008
@@ -80,7 +80,7 @@
use RT::Dashboard;
my $DashboardObj = RT::Dashboard->new( current_user => Jifty->web->current_user );
my ($ok, $msg) = $DashboardObj->LoadById($id);
-abort(loc("Couldn't load dashboard [_1]: [_2]", $id, $msg)) if !$ok;
+abort(loc("Couldn't load dashboard %1: %2", $id, $msg)) if !$ok;
my $SubscriptionObj = RT::Model::Attribute->new( current_user => Jifty->web->current_user );
my $Loaded = 0;
Modified: rt/branches/3.999-DANGEROUS/share/html/Dashboards/Subscription.html
==============================================================================
--- rt/branches/3.999-DANGEROUS/share/html/Dashboards/Subscription.html (original)
+++ rt/branches/3.999-DANGEROUS/share/html/Dashboards/Subscription.html Wed Jul 16 04:20:32 2008
@@ -190,7 +190,7 @@
: $ARGS{'DashboardId'};
($val, $msg) = $DashboardObj->LoadById($DashboardId);
-$val || abort(loc("Couldn't load dashboard [_1]: [_2].", $DashboardId, $msg));
+$val || abort(loc("Couldn't load dashboard %1: %2.", $DashboardId, $msg));
my %fields = (
DashboardId => $DashboardId,
@@ -233,7 +233,7 @@
}
# create
else {
- abort(loc("Unable to subscribe to dashboard [_1]: Permission denied", $DashboardId))
+ abort(loc("Unable to subscribe to dashboard %1: Permission denied", $DashboardId))
unless $DashboardObj->CurrentUserCanSubscribe;
my ($val, $msg) = $SubscriptionObj->Create(
@@ -244,21 +244,21 @@
Content => \%fields,
);
if ($val) {
- push @results, loc("Subscribed to dashboard [_1]", $DashboardObj->name);
+ push @results, loc("Subscribed to dashboard %1", $DashboardObj->name);
push @results, loc("Warning: you have no email address set, so you will not receive this dashboard until you have it set")
unless Jifty->web->current_user->email;
}
else {
- push @results, loc('Subscription could not be created: [_1]', $msg);
+ push @results, loc('Subscription could not be created: %1', $msg);
}
}
}
if ($SubscriptionObj->Id) {
- $title = loc("Modify the subscription to dashboard [_1]", $DashboardObj->name);
+ $title = loc("Modify the subscription to dashboard %1", $DashboardObj->name);
}
else {
- $title = loc("Subscribe to dashboard [_1]", $DashboardObj->name);
+ $title = loc("Subscribe to dashboard %1", $DashboardObj->name);
}
</%INIT>
Modified: rt/branches/3.999-DANGEROUS/share/html/Dashboards/index.html
==============================================================================
--- rt/branches/3.999-DANGEROUS/share/html/Dashboards/index.html (original)
+++ rt/branches/3.999-DANGEROUS/share/html/Dashboards/index.html Wed Jul 16 04:20:32 2008
@@ -78,7 +78,7 @@
my @actions;
if (defined $Deleted) {
- push @actions, loc("Deleted dashboard [_1]", $Deleted);
+ push @actions, loc("Deleted dashboard %1", $Deleted);
}
</%INIT>
Modified: rt/branches/3.999-DANGEROUS/share/html/Elements/RT__Scrip/ColumnMap
==============================================================================
--- rt/branches/3.999-DANGEROUS/share/html/Elements/RT__Scrip/ColumnMap (original)
+++ rt/branches/3.999-DANGEROUS/share/html/Elements/RT__Scrip/ColumnMap Wed Jul 16 04:20:32 2008
@@ -78,7 +78,7 @@
},
Autodescription => {
title => 'Condition, Action and Template',
- value => sub { return $_[0]->loc( "[_1] [_2] with template [_3]",
+ value => sub { return $_[0]->loc( "%1 %2 with template %3",
$_[0]->loc($_[0]->condition_obj->name),
$_[0]->loc($_[0]->action_obj->name),
$_[0]->loc($_[0]->template_obj->name),
Modified: rt/branches/3.999-DANGEROUS/share/html/Install/Basics.html
==============================================================================
--- rt/branches/3.999-DANGEROUS/share/html/Install/Basics.html (original)
+++ rt/branches/3.999-DANGEROUS/share/html/Install/Basics.html Wed Jul 16 04:20:32 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 &>
@@ -75,7 +75,7 @@
Meta => $RT::Installer->{Meta} );
if ( $ARGS{WebPort} && $ARGS{WebPort} !~ /^\d+$/ ) {
- push @errors, loc("Invalid [_1]: it should be a number", 'WebPort');
+ push @errors, loc("Invalid %1: it should be a number", 'WebPort');
}
unless ( $ARGS{Password} ) {
Modified: rt/branches/3.999-DANGEROUS/share/html/Install/DatabaseDetails.html
==============================================================================
--- rt/branches/3.999-DANGEROUS/share/html/Install/DatabaseDetails.html (original)
+++ rt/branches/3.999-DANGEROUS/share/html/Install/DatabaseDetails.html Wed Jul 16 04:20:32 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 &>
@@ -158,16 +158,16 @@
$sth->execute('RT_System');
if ( $sth->fetchrow_array ) {
$RT::Installer->{DatabaseAction} = 'none';
- push @results, loc("[_1] appears to be fully initialized. We won't need to create any tables or insert metadata, but you can continue to customez RT by clicking 'Customize Basics' below", $RT::DatabaseName);
+ push @results, loc("%1 appears to be fully initialized. We won't need to create any tables or insert metadata, but you can continue to customez RT by clicking 'Customize Basics' below", $RT::DatabaseName);
}
else {
$RT::Installer->{DatabaseAction} = 'acl,coredata,insert';
- push @results, loc("[_1] already exists and has RT's tables in place, but does not contain RT's metadata. The 'Initialize Database' step later on can insert metadata into this existing database. If this is acceptable, click 'Customize Basics' below to continue customizing RT.", $RT::DatabaseName);
+ push @results, loc("%1 already exists and has RT's tables in place, but does not contain RT's metadata. The 'Initialize Database' step later on can insert metadata into this existing database. If this is acceptable, click 'Customize Basics' below to continue customizing RT.", $RT::DatabaseName);
}
}
else {
$RT::Installer->{DatabaseAction} = 'schema,acl,coredata,insert';
- push @results, loc("[_1] already exists, but does not contain RT's tables or metadata. The 'Initialize Database' step later on can insert tables and metadata into this existing database. if this is acceptable, click 'Customize Basic' below to continue customizing RT.", $RT::DatabaseName );
+ push @results, loc("%1 already exists, but does not contain RT's tables or metadata. The 'Initialize Database' step later on can insert tables and metadata into this existing database. if this is acceptable, click 'Customize Basic' below to continue customizing RT.", $RT::DatabaseName );
}
}
@@ -178,7 +178,7 @@
}
else {
$RT::Installer->{DatabaseAction} = 'error';
- push @errors, loc("Failed to connect to database: [_1]",
+ push @errors, loc("Failed to connect to database: %1",
$DBI::errstr );
}
}
Modified: rt/branches/3.999-DANGEROUS/share/html/Install/DatabaseType.html
==============================================================================
--- rt/branches/3.999-DANGEROUS/share/html/Install/DatabaseType.html (original)
+++ rt/branches/3.999-DANGEROUS/share/html/Install/DatabaseType.html Wed Jul 16 04:20:32 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>
@@ -58,7 +58,7 @@
<&|/l&>SQLite is a database that doesn't need a server or any configuration whatsoever. RT's authors recommend it for testing, demoing and development, but it's not quite right for a high-volume production RT server.</&>
</b></p>
<p>
-<&|/l, '<a href="http://search.cpan.org" target="_new">CPAN</a>' &>If your preferred database isn't listed in the dropdown below, that means RT couldn't find a <i>database driver</i> for it installed locally. You may be able to remedy this by using [_1] to download and install DBD::MySQL, DBD::Oracle or DBD::Pg.</&>
+<&|/l, '<a href="http://search.cpan.org" target="_new">CPAN</a>' &>If your preferred database isn't listed in the dropdown below, that means RT couldn't find a <i>database driver</i> for it installed locally. You may be able to remedy this by using %1 to download and install DBD::MySQL, DBD::Oracle or DBD::Pg.</&>
</p>
</div>
Modified: rt/branches/3.999-DANGEROUS/share/html/Install/Finish.html
==============================================================================
--- rt/branches/3.999-DANGEROUS/share/html/Install/Finish.html (original)
+++ rt/branches/3.999-DANGEROUS/share/html/Install/Finish.html Wed Jul 16 04:20:32 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>
@@ -61,7 +61,7 @@
</p>
<p>
-<&|/l, RT::Installer->ConfigFile &>The settings you've chosen are stored in [_1]. You can edit this file to refine your configuration further. You can prevent this installation wizard from being shown again by running `<tt>chmod -w '[_1]'</tt>`.</&>
+<&|/l, RT::Installer->ConfigFile &>The settings you've chosen are stored in %1. You can edit this file to refine your configuration further. You can prevent this installation wizard from being shown again by running `<tt>chmod -w '%1'</tt>`.</&>
</p>
</div>
Modified: rt/branches/3.999-DANGEROUS/share/html/Install/Global.html
==============================================================================
--- rt/branches/3.999-DANGEROUS/share/html/Install/Global.html (original)
+++ rt/branches/3.999-DANGEROUS/share/html/Install/Global.html Wed Jul 16 04:20:32 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 &>
@@ -84,7 +84,7 @@
for ( qw/CommentAddress CorrespondAddress/ ) {
if ( $ARGS{$_} && $ARGS{$_} !~ /.+ at .+/ ) {
push @errors,
- loc("Invalid [_1]: '[_2]' doesn't look like an email address",
+ loc("Invalid %1: '%2' doesn't look like an email address",
$_, $ARGS{$_});
}
}
Modified: rt/branches/3.999-DANGEROUS/share/html/Install/Initialize.html
==============================================================================
--- rt/branches/3.999-DANGEROUS/share/html/Install/Initialize.html (original)
+++ rt/branches/3.999-DANGEROUS/share/html/Install/Initialize.html Wed Jul 16 04:20:32 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 &>
@@ -84,7 +84,7 @@
if ( $actions[0] eq 'create' ) {
($status, $msg) = RT::Handle->CreateDatabase( $sysdbh );
unless ( $status ) {
- push @errors, loc('ERROR: [_1]', $msg );
+ push @errors, loc('ERROR: %1', $msg );
}
shift @actions; # shift the 'create' action since its job is done.
@@ -121,7 +121,7 @@
($status, $msg) = $RT::Handle->InsertData( $file );
}
unless ( $status ) {
- push @errors, loc('ERROR: [_1]', $msg);
+ push @errors, loc('ERROR: %1', $msg);
last;
}
}
Modified: rt/branches/3.999-DANGEROUS/share/html/Install/Sendmail.html
==============================================================================
--- rt/branches/3.999-DANGEROUS/share/html/Install/Sendmail.html (original)
+++ rt/branches/3.999-DANGEROUS/share/html/Install/Sendmail.html Wed Jul 16 04:20:32 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 &>
@@ -81,12 +81,12 @@
unless ( -e $ARGS{SendmailPath} ) {
- push @errors, loc( "[_1] doesn't exist.", $ARGS{SendmailPath} );
+ push @errors, loc( "%1 doesn't exist.", $ARGS{SendmailPath} );
}
if ( ! $ARGS{OwnerEmail} || $ARGS{OwnerEmail} !~ /.+ at .+/ ) {
push @errors,
- loc("Invalid [_1]: that doesn't look like an email address",
+ loc("Invalid %1: that doesn't look like an email address",
'Administrator Email');
}
Modified: rt/branches/3.999-DANGEROUS/share/html/Install/index.html
==============================================================================
--- rt/branches/3.999-DANGEROUS/share/html/Install/index.html (original)
+++ rt/branches/3.999-DANGEROUS/share/html/Install/index.html Wed Jul 16 04:20:32 2008
@@ -83,7 +83,7 @@
$locked = 1 unless -w $file;
if ( $locked ) {
- push @errors, loc("Config file [_1] is locked", $file);
+ push @errors, loc("Config file %1 is locked", $file);
}
elsif ( $Run ) {
$RT::Installer->{InstallConfig} ||= {};
Modified: rt/branches/3.999-DANGEROUS/share/html/Ticket/Graphs/index.html
==============================================================================
--- rt/branches/3.999-DANGEROUS/share/html/Ticket/Graphs/index.html (original)
+++ rt/branches/3.999-DANGEROUS/share/html/Ticket/Graphs/index.html Wed Jul 16 04:20:32 2008
@@ -110,5 +110,5 @@
SearchFields => \@save_arguments,
);
-my $title = loc( "Ticket #[_1] relationships graph", $id );
+my $title = loc( "Ticket #%1 relationships graph", $id );
</%INIT>
Modified: rt/branches/3.999-DANGEROUS/share/html/Widgets/Form/String
==============================================================================
--- rt/branches/3.999-DANGEROUS/share/html/Widgets/Form/String (original)
+++ rt/branches/3.999-DANGEROUS/share/html/Widgets/Form/String Wed Jul 16 04:20:32 2008
@@ -66,7 +66,7 @@
$Default => 0,
$DefaultValue => '',
-$DefaultLabel => loc( 'Default: [_1]', $DefaultValue ),
+$DefaultLabel => loc( 'Default: %1', $DefaultValue ),
</%ARGS>
<%METHOD InputOnly>
More information about the Rt-commit
mailing list