[Rt-commit] r13532 - in rt/3.8/trunk: share/html/Install

sunnavy at bestpractical.com sunnavy at bestpractical.com
Sat Jun 21 03:19:33 EDT 2008


Author: sunnavy
Date: Sat Jun 21 03:19:33 2008
New Revision: 13532

Modified:
   rt/3.8/trunk/   (props changed)
   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/Emails.html
   rt/3.8/trunk/share/html/Install/Finish.html
   rt/3.8/trunk/share/html/Install/Initialize.html
   rt/3.8/trunk/share/html/Install/Sendmail.html

Log:
 r13602 at sunnavys-mb:  sunnavy | 2008-06-20 22:29:14 +0800
 split strings to be localized


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	Sat Jun 21 03:19:33 2008
@@ -45,7 +45,7 @@
 %# those contributions and any derivatives thereof.
 %# 
 %# END BPS TAGGED BLOCK }}}
-<&| Elements/Wrapper, Title => loc('Step 3 of 7: Customize Basics') &> 
+<&| Elements/Wrapper, Title => loc('Step [_1] of [_2]: ', 3, 7) . loc('Customize Basics') &> 
 
 <& /Elements/ListActions, actions => \@results &>
 
@@ -54,8 +54,7 @@
     CurrentValue => RT::Installer->CurrentValues(@Types) &>
 
 <input type="hidden" name="Run" value="1">
-<& /Elements/Submit, Label => loc('Next: Customize Email Addresses'), Back => 1,
-    BackLabel => loc('Back: Customize Database Details') &>
+<& /Elements/Submit, Label => loc('Next: ') . loc('Customize Email Addresses'), 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	Sat Jun 21 03:19:33 2008
@@ -45,7 +45,7 @@
 %# those contributions and any derivatives thereof.
 %# 
 %# END BPS TAGGED BLOCK }}}
-<&| Elements/Wrapper, Title => loc('Step 2 of 7: Check your database credentials') &> 
+<&| Elements/Wrapper, Title => loc('Step [_1] of [_2]: ', 2, 7 ) . loc('Check your database credentials') &> 
 
 <& /Elements/ListActions, actions => \@results &>
 
@@ -65,11 +65,11 @@
 <input type="hidden" name="Run" value="1">
 
 <& /Elements/Submit, Label => loc('Check Database Connectivity'), 
-Back => 1, BackLabel => loc('Back: Select Database Type'),
+Back => 1, BackLabel => loc('Back: ') . loc('Select Database Type'),
 &>
 
 % if ( @results && $results[0] eq 'Connection succeeded' ) {
-<& /Elements/Submit, Label => loc('Next: Customize Basics'), Name => 'Next' &>
+<& /Elements/Submit, Label => loc('Next: ') . loc('Customize Basics'), Name => 'Next' &>
 % }
 
 

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	Sat Jun 21 03:19:33 2008
@@ -45,15 +45,15 @@
 %# those contributions and any derivatives thereof.
 %# 
 %# END BPS TAGGED BLOCK }}}
-<&|Elements/Wrapper, Title => loc('Step 1 of 7: Choose a database engine') &>
+<&|Elements/Wrapper, Title => loc('Step [_1] of [_2]: ', 1, 7 ) . loc('Choose a database engine') &>
 
 <& /Elements/ListActions, actions => \@results &>
 
 <div class="intro">
 <&|/l&>
     <p>RT works just great with a number of different databases. <b>MySQL</b>, <b>PostgreSQL</b>, <b>Oracle</b> and <b>SQLite</b> are all supported.</p>
-    <p>You should choose the database you or your local database administrator is most comfortable with.</p>
-    <p><i>SQLite is a simple database that doesn't need a server or any configuration whatsoever. RT's authors recommend it for testing, demoing and development, but <b>it's not quite right for a high-volume production RT server</b>.</i></p>
+    <p>You should choose whichever database you or your local database administrator is most comfortable with.</p>
+    <p><b>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>If your supported 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 <a href="http://search.cpan.org" target="_new">CPAN</a> to download and install DBD::MySQL, DBD::Oracle or DBD::Pg.</p>
     </&>
 </div>
@@ -63,7 +63,7 @@
     CurrentValue => RT::Installer->CurrentValues(@Types) &>
 
 <input type="hidden" name="Run" value="1">
-<& /Elements/Submit, Label => loc('Next: Check your database credentials') &>
+<& /Elements/Submit, Label => loc('Next: ') . loc( 'Check your database credentials') &>
 </form>
 </&>
 <%init>

Modified: rt/3.8/trunk/share/html/Install/Emails.html
==============================================================================
--- rt/3.8/trunk/share/html/Install/Emails.html	(original)
+++ rt/3.8/trunk/share/html/Install/Emails.html	Sat Jun 21 03:19:33 2008
@@ -45,7 +45,7 @@
 %# those contributions and any derivatives thereof.
 %# 
 %# END BPS TAGGED BLOCK }}}
-<&| Elements/Wrapper, Title => loc('Step 4 of 7: Customize Email Addresses') &> 
+<&| Elements/Wrapper, Title => loc('Step [_1] of [_2]: ', 4, 7 ) . loc('Customize Email Addresses') &> 
 
 <& /Elements/ListActions, actions => \@results &>
 
@@ -54,8 +54,8 @@
     CurrentValue => RT::Installer->CurrentValues(@Types) &>
 
 <input type="hidden" name="Run" value="1">
-<& /Elements/Submit, Label => loc('Next: Email Configuration'), Back => 1,
-    BackLabel => loc('Back: Customize Basics') &>
+<& /Elements/Submit, Label => loc('Next: ') . loc( 'Email Configuration'), 
+    Back => 1, BackLabel => loc('Back: ' ) . loc( 'Customize Basics') &>
 </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	Sat Jun 21 03:19:33 2008
@@ -45,7 +45,7 @@
 %# those contributions and any derivatives thereof.
 %# 
 %# END BPS TAGGED BLOCK }}}
-<&| Elements/Wrapper, Title => loc('Step 7 of 7: Finish') &> 
+<&| Elements/Wrapper, Title => loc('Step [_1] of [_2]: ', 7, 7) . loc('Finish') &> 
 
 <div class="intro">
 <&|/l&>

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	Sat Jun 21 03:19:33 2008
@@ -45,7 +45,7 @@
 %# those contributions and any derivatives thereof.
 %# 
 %# END BPS TAGGED BLOCK }}}
-<&|Elements/Wrapper, Title => loc('Step 6 of 7: Initialize Database') &> 
+<&|Elements/Wrapper, Title => loc('Step [_1] of [_2]: ', 6, 7) . loc('Initialize Database') &> 
 
 <& /Elements/ListActions, actions => \@results &>
 
@@ -58,7 +58,7 @@
 <form method="post">
 <input type="hidden" name="Run" value="1">
 <& /Elements/Submit, Label => loc('Initialize Database'), Back => 1,
-    BackLabel => loc('Back: Customize Sendmail') &>
+    BackLabel => loc('Back: ') . loc('Customize Sendmail') &>
 </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	Sat Jun 21 03:19:33 2008
@@ -45,7 +45,7 @@
 %# those contributions and any derivatives thereof.
 %# 
 %# END BPS TAGGED BLOCK }}}
-<&|Elements/Wrapper, Title => loc('Step 5 of 7: Email Configuration') &> 
+<&|Elements/Wrapper, Title => loc('Step [_1] of [_2]: ', 5, 7 ) . loc('Email Configuration') &> 
 
 <& /Elements/ListActions, actions => \@results &>
 
@@ -55,8 +55,8 @@
 
 <input type="hidden" name="Run" value="1">
 <& /Elements/Submit, Label => $RT::Installer->{DatabaseAction} eq 'none' ?
-loc('Next: Finish') : loc('Next: Initialize Database'), Back => 1,
-    BackLabel => loc('Back: Customize Email Addresses') &>
+loc('Next: ') . loc('Finish') : loc('Next: ') . loc( 'Initialize Database'),
+    Back => 1, BackLabel => loc('Back: ' ) . loc('Customize Email Addresses') &>
 </form>
 </&>
 <%init>


More information about the Rt-commit mailing list