From 32746f1ed50e545cd6a3461f673b25d0047836c1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc=20V=C3=A9ron?= 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' %] -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 %] - +[% END %] + +[% BLOCK next_step %]Continue to the next step[% END %] + +[% INCLUDE installer_title %] + [% INCLUDE 'installer-doc-head-close.inc' %]
@@ -47,7 +53,7 @@
-

+

[% 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 @@

Web installer › Database settings

Database settings:

[% IF ( dbconnection ) %]
[% IF ( checkdatabaseaccess ) %] - + [% IF ( checkdatabasecreated ) %] [% ELSE %] -

user [% user %] doesn't have enough privilege on database [% dbname %]

-

Ask for or make a change in the user's privileges. Need help? See [% IF ( mysql ) %] - - [% ELSE %] - - [% END %] - this page. User [% user %] must have USAGE, INSERT, UPDATE, DELETE, DROP and CREATE privileges on [% dbname %] -

+

Not enough database privileges. User: [% user %] Database: [% dbname %]

+

Ask for or make a change in the user's privileges. User must have USAGE, INSERT, UPDATE, DELETE, DROP and CREATE privileges.

+ [% IF ( mysql ) %] +

Manual pages for MySQL

+ [% ELSE %] +

Manual pages for PostgreSQL

+ [% END %] [% END %] [% ELSE %] - +

Please create the database before continuing.

[% END %] [% ELSE %] @@ -48,16 +47,16 @@
  • Check that your database is running.
    • -
  • Check your database settings in koha-conf.xml.
    • -
  • Check the hostname setting in koha-conf.xml. +
  • Check your database settings in: koha-conf.xml
    • +
  • Check the hostname setting in: koha-conf.xml Some database servers require 127.0.0.1 rather than localhost.
-

Please correct these errors and start the installer again. +

Please correct these errors. Then start the installer again. [% END %] [% UNLESS ( error ) %] -

+

[% END %]
[% ELSE %] -- 2.1.4