Bugzilla – Attachment 63679 Details for
Bug 18629
Translatability: Fix problems with web installer 17.05
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 18629 - Web installer 17.05 not properly translatable
Bug-18629---Web-installer-1705-not-properly-transl.patch (text/plain), 8.02 KB, created by
Marc Véron
on 2017-05-24 05:50:05 UTC
(
hide
)
Description:
Bug 18629 - Web installer 17.05 not properly translatable
Filename:
MIME Type:
Creator:
Marc Véron
Created:
2017-05-24 05:50:05 UTC
Size:
8.02 KB
patch
obsolete
>From 32746f1ed50e545cd6a3461f673b25d0047836c1 Mon Sep 17 00:00:00 2001 >From: =?UTF-8?q?Marc=20V=C3=A9ron?= <veron@veron.ch> >Date: Fri, 19 May 2017 11:19:00 +0200 >Subject: [PATCH] Bug 18629 - Web installer 17.05 not properly translatable > >Fix for step1.tt > >To test: >- Create po files >- Verify that title and button text are picked by translator and appear in po file >- Verify that text in po files is not fragmented > >Work in progress. Comments welcome. >--- > .../prog/en/modules/installer/step1.tt | 12 +++++-- > .../prog/en/modules/installer/step2.tt | 41 +++++++++++----------- > 2 files changed, 29 insertions(+), 24 deletions(-) > >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 10e5589..e11bcbe 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/installer/step1.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/installer/step1.tt >@@ -1,5 +1,6 @@ > [% INCLUDE 'doc-head-open.inc' %] >-<title>Koha › Web installer › >+ >+[% BLOCK installer_title %]Koha › Web installer › > [% UNLESS ( language ) %] Choose your language [% END %] > [% IF ( language ) %] > [% UNLESS ( checkmodule ) %] >@@ -12,7 +13,12 @@ > [% END %] > Check Perl dependencies > [% END %] >-</title> >+[% END %] >+ >+[% BLOCK next_step %]Continue to the next step[% END %] >+ >+<title>[% INCLUDE installer_title %]</title> >+ > [% INCLUDE 'installer-doc-head-close.inc' %] > > <div class="container-fluid"> >@@ -47,7 +53,7 @@ > </select> > </div> > >- <p><input value="Continue to the next step" class="btn btn-primary" type="submit" /></p> >+ <p><input value="[%- INCLUDE next_step -%]" class="btn btn-primary" type="submit" /></p> > </form> > [% END %] > >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 ba44fd4..6ef37b7f 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/installer/step2.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/installer/step2.tt >@@ -11,36 +11,35 @@ > <h2>Web installer › Database settings</h2> > <h3>Database settings:</h3> > <ul> >- <li><em>Database type : </em> <code>[% dbms %]</code></li> >- <li><em>Database name : </em> <code>[% dbname %]</code></li> >- <li><em>Database host : </em> <code>[% hostname %]</code></li> >- <li><em>Database port : </em> <code>[% port %]</code> (probably okay if blank)</li> >- <li><em>Database user : </em> <code>[% user %]</code></li> >+ <li><em>Database type: </em><code>[% dbms %]</code></li> >+ <li><em>Database name: </em><code>[% dbname %]</code></li> >+ <li><em>Database host: </em><code>[% hostname %]</code></li> >+ <li><em>Database port: </em><code>[% port %]</code> (probably okay if blank)</li> >+ <li><em>Database user: </em><code>[% user %]</code></li> > </ul> > > [% IF ( dbconnection ) %] > <form name="checkdbparameters" method="post" action="install.pl"> > [% IF ( checkdatabaseaccess ) %] >- <div class="alert alert-success" role="alert"><p>Connection established.</p></div> >+ <div class="alert alert-success" role="alert"><p>Database connection established.</p></div> > [% IF ( checkdatabasecreated ) %] > <ul> >- <li>Database <code>[% dbname %]</code> exists.</li> >+ <li>Database exists: <code>[% dbname %]</code></li> > [% IF ( checkgrantaccess ) %] >- <li>User <code>[% user %]</code> has all required privileges on database <code>[% dbname %]</code>.</li> >+ <li>User has all required privileges. User: <code>[% user %]</code> Database: <code>[% dbname %]</code></li> > </ul> > [% ELSE %] > </ul> >- <p class="error">user <code>[% user %]</code> doesn't have enough privilege on database <code>[% dbname %]</code> </p> >- <p class="tip"> Ask for or make a change in the user's privileges. Need help? See [% IF ( mysql ) %] >- <a href="http://dev.mysql.com/doc/refman/4.1/en/grant.html"> >- [% ELSE %] >- <a href="http://www.postgresql.org/docs/8.2/interactive/sql-createrole.html"> >- [% END %] >- this page</a>. User <code>[% user %]</code> must have USAGE, INSERT, UPDATE, DELETE, DROP and CREATE privileges on <code>[% dbname %]</code> >- </p> >+ <p class="error">Not enough database privileges. User: <code>[% user %]</code> Database: <code>[% dbname %]</code> </p> >+ <p class="tip"> Ask for or make a change in the user's privileges. User must have USAGE, INSERT, UPDATE, DELETE, DROP and CREATE privileges.</p> >+ [% IF ( mysql ) %] >+ <p><a href="http://dev.mysql.com/doc/refman/4.1/en/grant.html">Manual pages for MySQL</a></p> >+ [% ELSE %] >+ <p><a href="http://www.postgresql.org/docs/8.2/interactive/sql-createrole.html"><p><a href="http://dev.mysql.com/doc/refman/4.1/en/grant.html">Manual pages for PostgreSQL</a></p> >+ [% END %] > [% END %] > [% ELSE %] >- <div class="alert alert-danger" role="alert"><p>No database named <code>[% dbname %]</code> detected.</p></div> >+ <div class="alert alert-danger" role="alert"><p>No database with this name detected:<code>[% dbname %]</code></p></div> > <p>Please create the database before continuing.</p> > [% END %] > [% ELSE %] >@@ -48,16 +47,16 @@ > <div class="tip"> > <ul> > <li>Check that your database is running.</li> >- <li>Check your database settings in <code>koha-conf.xml</code>. </li> >- <li>Check the hostname setting in <code>koha-conf.xml</code>. >+ <li>Check your database settings in: <code>koha-conf.xml</code></li> >+ <li>Check the hostname setting in: <code>koha-conf.xml</code> > Some database servers require <code>127.0.0.1</code> rather than <code>localhost</code>.</li> > </ul> > </div> >- <p>Please correct these errors and <a href="/cgi-bin/koha/installer/install.pl">start the installer</a> again. >+ <p>Please correct these errors. <a href="/cgi-bin/koha/installer/install.pl">Then start the installer again.</a> > [% END %] > [% UNLESS ( error ) %] > <input type="hidden" name="step" value="3" /> >- <p> <input value="Continue to the next step" class="btn btn-primary" type="submit" /> </p> >+ <p><input value="Continue to the next step" class="btn btn-primary" type="submit" /></p> > [% END %] > </form> > [% ELSE %] >-- >2.1.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 18629
:
63573
|
63679
|
63741
|
63742
|
63759
|
63768
|
64274
|
66648
|
66649