From a67b553a49adfb82641e1afc860fa522c8af1352 Mon Sep 17 00:00:00 2001 From: Julian Maurice Date: Mon, 25 Jun 2018 08:49:52 +0200 Subject: [PATCH] Bug 20988: koha-tmpl/intranet-tmpl/prog/en/modules/installer --- .../prog/en/modules/installer/auth.tt | 33 ++--- .../prog/en/modules/installer/step1.tt | 43 +++---- .../prog/en/modules/installer/step2.tt | 47 ++++---- .../prog/en/modules/installer/step3.tt | 113 +++++++++--------- 4 files changed, 120 insertions(+), 116 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 41d2494a0e..a5a91d9004 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/installer/auth.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/installer/auth.tt @@ -1,11 +1,12 @@ +[% PROCESS 'i18n.inc' %] [% USE Koha %] [% INCLUDE 'doc-head-open.inc' %] -Koha › - [% IF ( nopermission ) %]Access denied[% END %] - [% IF ( timed_out ) %]Session timed out[% END %] - [% IF ( different_ip ) %]IP address change[% END %] - [% IF ( invalid_username_or_password ) %]Invalid username or password[% END %] - [% IF ( loginprompt ) %]Log in to the Koha web installer[% END %] +<title>[% t('Koha ›') %] + [% IF ( nopermission ) %][% t('Access denied') %][% END %] + [% IF ( timed_out ) %][% t('Session timed out') %][% END %] + [% IF ( different_ip ) %][% t('IP address change') %][% END %] + [% IF ( invalid_username_or_password ) %][% t('Invalid username or password') %][% END %] + [% IF ( loginprompt ) %][% t('Log in to the Koha web installer') %][% END %] [% INCLUDE 'installer-doc-head-close.inc' %] @@ -15,28 +16,28 @@
-

Koha

+

[% t('Koha') %]

[% IF ( nopermission ) %] -
Error: Unauthorized user click to log out
+
[% t('Error:') %] [% t('Unauthorized user') %] [% t('click to log out') %]
[% END %] [% IF ( timed_out ) %] -
Error: Session timed out, please log in again
+
[% t('Error:') %] [% t('Session timed out, please log in again') %]
[% END %] [% IF ( different_ip ) %] -
Error: IP address has changed, please log in again
+
[% t('Error:') %] [% t('IP address has changed, please log in again') %]
[% END %] [% IF ( invalid_username_or_password ) %] -
Error: Invalid username or password
+
[% t('Error:') %] [% t('Invalid username or password') %]
[% END %] [% IF ( loginprompt ) %] -

Welcome to the Koha [%- Koha.Version.release -%] web installer

+

[% t('Welcome to the Koha') %] [%- Koha.Version.release -%] [% t('web installer') %]

-

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 koha-conf.xml configuration file.

+

[% t('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') %] [% t('koha-conf.xml') %] [% t('configuration file.') %]

[% FOREACH INPUT IN INPUTS %] @@ -44,14 +45,14 @@ [% END %]
- Please enter your username and password + [% t('Please enter your username and password') %]
- +
- +
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 806f28eb79..195e77541e 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/installer/step1.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/installer/step1.tt @@ -1,16 +1,17 @@ +[% PROCESS 'i18n.inc' %] [% INCLUDE 'doc-head-open.inc' %] -Koha › Web installer › - [% UNLESS ( language ) %] Choose your language [% END %] +<title>[% t('Koha › Web installer ›') %] + [% UNLESS ( language ) %] [% t('Choose your language') %] [% END %] [% IF ( language ) %] [% UNLESS ( checkmodule ) %] [% IF ( missing_modules ) %] - Perl modules missing + [% t('Perl modules missing') %] [% END %] [% IF ( problems ) %] - Perl version obsolete + [% t('Perl version obsolete') %] [% END %] [% END %] - Check Perl dependencies + [% t('Check Perl dependencies') %] [% END %] [% INCLUDE 'installer-doc-head-close.inc' %] @@ -19,17 +20,17 @@
-

Koha

+

[% t('Koha') %]

[% UNLESS ( language ) %] -

Web installer › Choose your language

-

You are about to install Koha.

+

[% t('Web installer › Choose your language') %]

+

[% t('You are about to install Koha.') %]

-

Please pick your language from the following list. If your language is not listed, please inform your system administrator.

+

[% t('Please pick your language from the following list. If your language is not listed, please inform your system administrator.') %]

- + 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 22936a6d76..2f2c6a5b0d 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/installer/step2.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/installer/step2.tt @@ -1,5 +1,6 @@ +[% PROCESS 'i18n.inc' %] [% USE HtmlTags %] -[% INCLUDE 'doc-head-open.inc' %]Koha › Web installer › Database settings +[% INCLUDE 'doc-head-open.inc' %][% t('Koha › Web installer › Database settings') %] [% INCLUDE 'installer-doc-head-close.inc' %] @@ -8,52 +9,52 @@
-

Koha

-

Web installer › Database settings

-

Database settings:

+

[% t('Koha') %]

+

[% t('Web installer › Database settings') %]

+

[% t('Database settings:') %]

    -
  • Database type: [%- dbms | $HtmlTags tag=>'code' -%]
    • -
  • Database name: [%- dbname | $HtmlTags tag=>'code' -%]
    • -
  • Database host: [%- hostname | $HtmlTags tag=>'code'-%]
    • -
  • Database port: [%- port| $HtmlTags tag=>'code' -%] (probably okay if blank)
    • -
  • Database user: [%- user | $HtmlTags tag=>'code' -%]
    • +
  • [% t('Database type:') %] [%- dbms | $HtmlTags tag=>'code' -%]
    • +
  • [% t('Database name:') %] [%- dbname | $HtmlTags tag=>'code' -%]
    • +
  • [% t('Database host:') %] [%- hostname | $HtmlTags tag=>'code'-%]
    • +
  • [% t('Database port:') %] [%- port| $HtmlTags tag=>'code' -%] [% t('(probably okay if blank)') %]
    • +
  • [% t('Database user:') %] [%- user | $HtmlTags tag=>'code' -%]
[% IF ( dbconnection ) %] [% IF ( checkdatabaseaccess ) %] - + [% IF ( checkdatabasecreated ) %]
    -
  • Database [% dbname | $HtmlTags tag=>'code'%] exists.
    • +
  • [% t('Database') %] [% dbname | $HtmlTags tag=>'code'%] [% t('exists.') %]
    • [% IF ( checkgrantaccess ) %] -
  • User [% user | $HtmlTags tag=>'code' %] has all required privileges on database [% dbname | $HtmlTags tag=>'code' %].
    • +
  • [% t('User') %] [% user | $HtmlTags tag=>'code' %] [% t('has all required privileges on database') %] [% dbname | $HtmlTags tag=>'code' %].
[% ELSE %] -

User [% user | $HtmlTags tag=>'code' %] doesn't have enough privilege on database [% dbname | $HtmlTags tag=>'code'%].

-

Ask for or make a change in the user's privileges. User [% user | $HtmlTags tag=>'code' %] must have USAGE, INSERT, UPDATE, DELETE, DROP and CREATE privileges on database [% dbname | $HtmlTags tag=>'code' %].

-

Need help? See manual for [% IF ( mysql ) %] - MySQL +

[% t('User') %] [% user | $HtmlTags tag=>'code' %] [% t('doesn\'t have enough privilege on database') %] [% dbname | $HtmlTags tag=>'code'%].

+

[% t('Ask for or make a change in the user\'s privileges. User') %] [% user | $HtmlTags tag=>'code' %] [% t('must have USAGE, INSERT, UPDATE, DELETE, DROP and CREATE privileges on database') %] [% dbname | $HtmlTags tag=>'code' %].

+

[% t('Need help? See manual for') %] [% IF ( mysql ) %] + [% t('MySQL') %] [% ELSE %] - PostgreSQL + [% t('PostgreSQL') %] [% END %]

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

Please create the database before continuing.

+ +

[% t('Please create the database before continuing.') %]

[% END %] [% ELSE %]
    -
  • Check that your database is running.
    • -
  • Check your database settings in [% 'koha-conf.xml' | $HtmlTags Tag=>'code' %].
    • -
  • Check the hostname setting in [% INCLUDE txt_kohaconf_xml %]. Some database servers require [% '127.0.0.1' | $HtmlTags tag=>'code' %] rather than [% 'localhost' | $HtmlTags tag=>'code' %].
    • +
  • [% t('Check that your database is running.') %]
    • +
  • [% t('Check your database settings in') %] [% 'koha-conf.xml' | $HtmlTags Tag=>'code' %].
    • +
  • [% t('Check the hostname setting in') %] [% INCLUDE txt_kohaconf_xml %][% t('. Some database servers require') %] [% '127.0.0.1' | $HtmlTags tag=>'code' %] [% t('rather than') %] [% 'localhost' | $HtmlTags tag=>'code' %].
-

Please correct these errors. Then start the installer again. +

[% t('Please correct these errors.') %] [% t('Then start the installer again.') %] [% END %] [% UNLESS ( error ) %] 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 0657946d44..d634a652dd 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/installer/step3.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/installer/step3.tt @@ -1,34 +1,35 @@ +[% PROCESS 'i18n.inc' %] [% INCLUDE 'doc-head-open.inc' %] -Koha › Web installer › +<title>[% t('Koha › Web installer ›') %] [% IF ( proposeimport ) %] - Set up database + [% t('Set up database') %] [% END %] [% IF ( importdatastructure ) %] [% IF ( error ) %] - Error creating database tables + [% t('Error creating database tables') %] [% ELSE %] - Database tables created + [% t('Database tables created') %] [% END %] [% END %] [% IF ( default ) %] [% IF ( upgrading ) %] - Update database + [% t('Update database') %] [% ELSE %] - Install basic configuration settings + [% t('Install basic configuration settings') %] [% END %] [% END %] [% IF ( choosemarc ) %] - Select your MARC flavor + [% t('Select your MARC flavor') %] [% END %] [% IF ( selectframeworks ) %] - Selecting default settings + [% t('Selecting default settings') %] [% END %] [% IF ( addframeworks ) %] - Default data loaded + [% t('Default data loaded') %] [% END %] [% IF ( finish ) %] - Installation complete + [% t('Installation complete') %] [% END %] @@ -43,21 +44,21 @@

-

Koha

+

[% t('Koha') %]

[% IF ( finish ) %] -

Web installer › Installation complete

-

Congratulations, installation complete

-

This page will redirect in 10 seconds. If not, click here to start onboarding process.

+

[% t('Web installer › Installation complete') %]

+

[% t('Congratulations, installation complete') %]

+

[% t('This page will redirect in 10 seconds.') %] [% t('If not, click here to start onboarding process.') %]

[% END %] [% IF ( choosemarc ) %] -

Select your MARC flavor

+

[% t('Select your MARC flavor') %]

-

MARC stands for Machine Readable Cataloging. A MARC record contains bibliographic information about an item. MARC21 is used globally, UNIMARC tends to be used in a few European countries.

+

[% t('MARC stands for Machine Readable Cataloging. A MARC record contains bibliographic information about an item. MARC21 is used globally, UNIMARC tends to be used in a few European countries.') %]

[% FOREACH flavourloo IN flavourloop %] [% IF ( flavourloo.label == "Unimarc") %] @@ -75,17 +76,17 @@ [% END # / IF choosemarc %] [% IF ( selectframeworks ) %] -

Web installer › Selecting default settings

+

[% t('Web installer › Selecting default settings') %]

[% IF ( frameworksloop ) %] -

MARC frameworks: [% marcflavour %]

+

[% t('MARC frameworks:') %] [% marcflavour %]

[% IF ( en_marc_frameworks ) %] -

No MARC frameworks are available for your language. - Defaulting to the frameworks supplied for English (en)

+

[% t('No MARC frameworks are available for your language.') %] + [% t('Defaulting to the frameworks supplied for English (en)') %]

[% END %] [% FOREACH frameworksloo IN frameworksloop %]

[% frameworksloo.label %]

@@ -93,17 +94,17 @@

- Select all - Select none + [% t('Select all') %] + [% t('Select none') %]

[% FOREACH framework IN frameworksloo.frameworks %]
-- 2.17.1