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

[clkao at bestpractical.com]

Author: clkao
Date: Mon Jun 30 10:42:39 2008
New Revision: 13693

Modified:
   rt/3.8/trunk/sbin/tweak-template-locstring
   rt/3.8/trunk/share/html/Install/DatabaseType.html
   rt/3.8/trunk/share/html/Install/Finish.html

Log:
More tweaks for locstrings with args.

Modified: rt/3.8/trunk/sbin/tweak-template-locstring
==============================================================================
--- rt/3.8/trunk/sbin/tweak-template-locstring	(original)
+++ rt/3.8/trunk/sbin/tweak-template-locstring	Mon Jun 30 10:42:39 2008
@@ -1,12 +1,8 @@
 #!/usr/bin/perl -w
 use strict;
-
-
-#local $/;
-
-#$_ = <>;
-s!\<\&\|\/l\&\>[\n\s]+(.*?)[\n\s]*\<\/\&\>!my $x = $1; $x =~ s/\s*\n\s*/ /g;"<&|/l&>$x</&>"!smge;
-#print $_;
+# run this script with:
+# perl -0pi sbin/tweak-template-locstring `ack -f share/html -G 'html$'`
+s!\<\&\|\/l([^&]*)\&\>[\n\s]+(.*?)[\n\s]*\<\/\&\>!;my ($arg, $x) = ($1, $2); $x =~ s/\s*\n\s*/ /g;"<&|/l$arg&>$x</&>"!smge;
 
 
 1;

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	Mon Jun 30 10:42:39 2008
@@ -58,11 +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/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	Mon Jun 30 10:42:39 2008
@@ -61,10 +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>