Bugzilla – Attachment 8988 Details for
Bug 2780
Capitalize strings consistently
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 2780 - Capitalize strings consistently (Installer)
Bug-2780---Capitalize-strings-consistently-Install.patch (text/plain), 8.15 KB, created by
Owen Leonard
on 2012-04-06 19:47:09 UTC
(
hide
)
Description:
Bug 2780 - Capitalize strings consistently (Installer)
Filename:
MIME Type:
Creator:
Owen Leonard
Created:
2012-04-06 19:47:09 UTC
Size:
8.15 KB
patch
obsolete
>From 759d02b83e6d7b57c513948598e96c4a2e489d49 Mon Sep 17 00:00:00 2001 >From: Owen Leonard <oleonard@myacpl.org> >Date: Fri, 6 Apr 2012 15:42:02 -0400 >Subject: [PATCH] Bug 2780 - Capitalize strings consistently (Installer) >Content-Type: text/plain; charset="utf-8" > >Correcting capitalization in Installer templates >--- > .../prog/en/modules/installer/auth.tt | 2 +- > .../prog/en/modules/installer/step1.tt | 10 +++++----- > .../prog/en/modules/installer/step2.tt | 11 ++++------- > .../prog/en/modules/installer/step3.tt | 18 +++++++++--------- > 4 files changed, 19 insertions(+), 22 deletions(-) > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/installer/auth.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/installer/auth.tt >index 909398e..026d022 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/installer/auth.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/installer/auth.tt >@@ -32,7 +32,7 @@ > [% FOREACH INPUT IN INPUTS %] > <input type="hidden" name="[% INPUT.name |html %]" value="[% INPUT.value |html %]" /> > [% END %] >-<h3>Welcome to the Koha Web Installer</h3> >+<h3>Welcome to the Koha web installer</h3> > <p>Before we begin, please verify you have the correct credentials to continue. Please log in > with the username and password given to you by your systems administrator and located in your > <code>koha-conf.xml</code> configuration file.</p> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/installer/step1.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/installer/step1.tt >index 52c52c6..3712217 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/installer/step1.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/installer/step1.tt >@@ -1,8 +1,8 @@ > [% INCLUDE 'doc-head-open.inc' %] >-<title>Koha › Web Installer › Step 1</title> >+<title>Koha › Web installer › Step 1</title> > [% INCLUDE 'installer-doc-head-close.inc' %] > <div> >-<h1 id="logo"><img alt="Koha" src="/intranet-tmpl/prog/img/koha.org-logo.gif" /> Web Installer › Step 1</h1> >+<h1 id="logo"><img alt="Koha" src="/intranet-tmpl/prog/img/koha.org-logo.gif" /> Web installer › Step 1</h1> > [% UNLESS ( language ) %] > <p>You are about to install Koha.</p> > >@@ -26,13 +26,13 @@ listed, please inform your systems administrator.</p> > </select> > </p> > >-<p> Click Next to continue <input value="Next >>" type="submit" /></p> >+<p> Click 'Next' to continue <input value="Next >>" type="submit" /></p> > </form> > [% END %] > [% IF ( language ) %] > [% UNLESS ( checkmodule ) %] > [% IF ( missing_modules ) %] >- <p>Some perl modules are missing. Modules in red <b>must</b> be installed before you may continue.<br /> >+ <p>Some Perl modules are missing. Modules in red <b>must</b> be installed before you may continue.<br /> > <ul> > [% FOREACH missing_module IN missing_modules %] > [% IF ( missing_module.require ) %] >@@ -59,7 +59,7 @@ listed, please inform your systems administrator.</p> > [% IF ( checkmodule ) %] > <input type="hidden" name="step" value="2" /> > <p> All dependencies installed.</p> >-<p>Please click next to continue <input value="Next >>" type="submit" /></p> >+<p>Please click 'Next' to continue <input value="Next >>" type="submit" /></p> > [% ELSE %] > <input type="hidden" name="step" value="1" /> > <p>Click to recheck dependencies <input value="Recheck" type="submit" /></p> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/installer/step2.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/installer/step2.tt >index 1cac173..458ff42 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/installer/step2.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/installer/step2.tt >@@ -1,10 +1,7 @@ >- >- >- >-[% INCLUDE 'doc-head-open.inc' %]<title>Koha › Web Installer › Step 2</title> >+[% INCLUDE 'doc-head-open.inc' %]<title>Koha › Web installer › Step 2</title> > [% INCLUDE 'installer-doc-head-close.inc' %] > <div> >-<h1 id="logo"><img alt="Koha" src="/intranet-tmpl/prog/img/koha.org-logo.gif" /> Web Installer › Step 2</h1> >+<h1 id="logo"><img alt="Koha" src="/intranet-tmpl/prog/img/koha.org-logo.gif" /> Web installer › Step 2</h1> > <h2 align="center">Database settings:</h2> > <ul> > <li><em>database type : </em>[% dbms %]</li> >@@ -44,14 +41,14 @@ > [% END %] > [% IF ( error ) %][% ELSE %] > <input type="hidden" name="step" value="3" /> >-<p> Click Next to continue <input value="Next >>" type="submit" /></p> >+<p> Click 'Next' to continue <input value="Next >>" type="submit" /></p> > [% END %] > </form> > [% ELSE %] > <form name="checkinformation" type="post" action="install.pl"> > <input type="hidden" name="step" value="2" /> > <input type="hidden" name="checkdb" value="1" /> >-<p> Please click Next to continue if this information is correct <input value="Next >>" type="submit" /></p> >+<p> Please click 'Next' to continue if this information is correct <input value="Next >>" type="submit" /></p> > </form> > [% END %] > </div> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/installer/step3.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/installer/step3.tt >index 9db885a..7351c36 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/installer/step3.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/installer/step3.tt >@@ -1,8 +1,8 @@ >-[% INCLUDE 'doc-head-open.inc' %]<title>Koha › Web Installer › Step 3</title> >+[% INCLUDE 'doc-head-open.inc' %]<title>Koha › Web installer › Step 3</title> > [% IF ( finish ) %]<meta http-equiv="refresh" content="10; url=/cgi-bin/koha/mainpage.pl">[% END %] > [% INCLUDE 'installer-doc-head-close.inc' %] > <div> >-<h1 id="logo"><img alt="Koha" src="/intranet-tmpl/prog/img/koha.org-logo.gif" /> Web Installer › Step 3</h1> >+<h1 id="logo"><img alt="Koha" src="/intranet-tmpl/prog/img/koha.org-logo.gif" /> Web installer › Step 3</h1> > > [% IF ( selectframeworks ) %] > <script language="JavaScript"> >@@ -77,11 +77,11 @@ > </script> > [% END %] > [% IF ( finish ) %] >- <h1>Congratulations, Installation complete</h1> >+ <h1>Congratulations, installation complete</h1> > <p>If this page does not redirect in 5 seconds, click <a href="/">here</a>.</p> > [% END %] > [% IF ( choosemarc ) %] >- <h2 align="center">Select your MARC flavour</h2> >+ <h2 align="center">Select your MARC flavor</h2> > <form name="frameworkselection" method="post" action="install.pl"> > <input type="hidden" name="step" value="3" /> > <input type="hidden" name="op" value="selectframeworks" /> >@@ -96,7 +96,7 @@ > </div> > [% END %] > </p> >- <p> Click Next to continue <input value="Next >>" type="submit" /></p> >+ <p> Click 'Next' to continue <input value="Next >>" type="submit" /></p> > </form> > [% END %] > >@@ -107,7 +107,7 @@ > <input type="hidden" name="op" value="addframeworks" /> > > [% IF ( frameworksloop ) %] >- <h2>MARC Frameworks: [% marcflavour %]</h2> >+ <h2>MARC frameworks: [% marcflavour %]</h2> > [% IF ( en_marc_frameworks ) %] > <h4><span class="error">No MARC frameworks are available for your language. > Defaulting to the frameworks supplied for English (en)<span></h4> >@@ -182,7 +182,7 @@ > [% END %] > <h3>All done!</h3> > <p>Installation complete.<br /> >- <p>Click on Finish to complete and load the Koha Staff Interface. >+ <p>Click on 'Finish' to complete and load the Koha Staff Interface. > <form name="finish"> > <input type="hidden" name="step" value="3" /> > <input type="hidden" name="op" value="finish" /> >@@ -204,7 +204,7 @@ > </ul> > <form action="install.pl"> > <input type="hidden" name="step" value="3" /> >- <p> Click Next to continue <input value="Next >>" type="submit" /></p> >+ <p> Click 'Next' to continue <input value="Next >>" type="submit" /></p> > </form> > [% END %] > [% END %] >@@ -215,7 +215,7 @@ > <form action="install.pl"> > <input type="hidden" name="step" value="3" /> > <input type="hidden" name="op" value="importdatastructure" /> >- <p> Click Next to continue <input value="Next >>" type="submit" /></p> >+ <p> Click 'Next' to continue <input value="Next >>" type="submit" /></p> > </form> > [% END %] > >-- >1.7.5.4
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 2780
:
8804
|
8805
|
8807
|
8808
|
8810
|
8812
|
8813
|
8815
|
8817
|
8818
|
8819
|
8820
|
8821
|
8823
|
8829
|
8832
|
8840
|
8841
|
8842
|
8843
|
8844
|
8845
|
8846
|
8847
|
8848
|
8849
|
8850
|
8851
|
8852
|
8853
|
8854
|
8866
|
8870
|
8871
|
8875
|
8880
|
8882
|
8883
|
8884
|
8926
|
8928
|
8929
|
8930
|
8935
|
8954
|
8960
|
8977
|
8978
|
8979
|
8980
|
8981
|
8983
|
8984
|
8985
|
8986
|
8987
|
8988
|
8989
|
8990
|
8991
|
8992
|
8993
|
8994
|
8995
|
8996
|
9013
|
9014
|
9015
|
9016
|
9017
|
9018
|
9019
|
9020
|
9021
|
9022
|
9023
|
9024
|
9025
|
9026
|
9027
|
9028
|
9029
|
9047
|
9048
|
9052
|
9054
|
9055
|
9056
|
9057
|
9058
|
9068
|
9069
|
9070
|
9071
|
9072
|
9073
|
9089
|
9091
|
9092