Attachment 76354 Details for Bug 20988 – Bug 20988: koha-tmpl/intranet-tmpl/prog/en/modules/installer

[patch] Bug 20988: koha-tmpl/intranet-tmpl/prog/en/modules/installer

Bug-20988-koha-tmplintranet-tmplprogenmodulesinsta.patch (text/plain), 35.10 KB, created by Julian Maurice on 2018-06-25 07:23:12 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Julian Maurice

Created: 2018-06-25 07:23:12 UTC

Size: 35.10 KB

patch

obsolete

>From a67b553a49adfb82641e1afc860fa522c8af1352 Mon Sep 17 00:00:00 2001
>From: Julian Maurice <julian.maurice@biblibre.com>
>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' %]
>-<title>Koha &rsaquo;
>-    [% 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 %]
> </title>
> [% INCLUDE 'installer-doc-head-close.inc' %]
> </head>
>@@ -15,28 +16,28 @@
>         <div class="row">
>             <div id="installer-login" class="installer-main col-sm-6 col-sm-offset-3 col-md-6 col-md-offset-3">
> 
>-                <h1 id="logo"><a href="#">Koha</a></h1>
>+                <h1 id="logo"><a href="#">[% t('Koha') %]</a></h1>
> 
>                 [% IF ( nopermission ) %]
>-                    <div id="login_error" class="alert alert-danger"><strong>Error: </strong>Unauthorized user <a href="/cgi-bin/koha/mainpage.pl?logout.x=1">click to log out</a></div>
>+                    <div id="login_error" class="alert alert-danger"><strong>[% t('Error:') %] </strong>[% t('Unauthorized user') %] <a href="/cgi-bin/koha/mainpage.pl?logout.x=1">[% t('click to log out') %]</a></div>
>                 [% END %]
> 
>                 [% IF ( timed_out ) %]
>-                <div id="login_error" class="alert alert-danger"><strong>Error: </strong>Session timed out, please log in again</div>
>+                <div id="login_error" class="alert alert-danger"><strong>[% t('Error:') %] </strong>[% t('Session timed out, please log in again') %]</div>
>                 [% END %]
> 
>                 [% IF ( different_ip ) %]
>-                <div id="login_error" class="alert alert-danger"><strong>Error: </strong>IP address has changed, please log in again </div>
>+                <div id="login_error" class="alert alert-danger"><strong>[% t('Error:') %] </strong>[% t('IP address has changed, please log in again') %] </div>
>                 [% END %]
> 
>                 [% IF ( invalid_username_or_password ) %]
>-                <div id="login_error" class="alert alert-danger"><strong>Error: </strong>Invalid username or password</div>
>+                <div id="login_error" class="alert alert-danger"><strong>[% t('Error:') %] </strong>[% t('Invalid username or password') %]</div>
>                 [% END %]
> 
>                 [% IF ( loginprompt ) %]
>-                    <h2>Welcome to the Koha [%- Koha.Version.release -%] web installer</h2>
>+                    <h2>[% t('Welcome to the Koha') %] [%- Koha.Version.release -%] [% t('web installer') %]</h2>
> 
>-                    <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>
>+                    <p>[% 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') %] <code>[% t('koha-conf.xml') %]</code> [% t('configuration file.') %]</p>
> 
>                     <form action="[% url %]" method="post" id="mainform">
>                         [% FOREACH INPUT IN INPUTS %]
>@@ -44,14 +45,14 @@
>                         [% END %]
> 
>                         <fieldset>
>-                            <legend>Please enter your username and password</legend>
>+                            <legend>[% t('Please enter your username and password') %]</legend>
> 
>                             <div class="form-group">
>-                                <label>Username:</label>
>+                                <label>[% t('Username:') %]</label>
>                                 <input type="text" class="form-control" name="userid" id="userid" value="[% userid %]" size="20" tabindex="1" />
>                             </div>
>                             <div class="form-group">
>-                                <label>Password:</label>
>+                                <label>[% t('Password:') %]</label>
>                                 <input type="password" class="form-control" name="password" id="password" value="" size="20" tabindex="2" />
>                             </div>
>                             <input id="submit" type="submit" class="btn btn-primary" value="Log in" tabindex="3" />
>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' %]
>-<title>Koha &rsaquo; Web installer &rsaquo;
>-    [% 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 %]
> </title>
> [% INCLUDE 'installer-doc-head-close.inc' %]
>@@ -19,17 +20,17 @@
>     <div class="row">
>         <div id="installer-step1" class="installer-main col-sm-8 col-sm-offset-2 col-md-8 col-md-offset-2">
> 
>-            <h1 id="logo"><a href="#">Koha</a></h1>
>+            <h1 id="logo"><a href="#">[% t('Koha') %]</a></h1>
> 
>             [% UNLESS ( language ) %]
>-                <h2>Web installer &rsaquo; Choose your language</h2>
>-                <p>You are about to install Koha.</p>
>+                <h2>[% t('Web installer âº Choose your language') %]</h2>
>+                <p>[% t('You are about to install Koha.') %]</p>
> 
>-                <p>Please pick your language from the following list. If your language is not listed, please inform your system administrator.</p>
>+                <p>[% t('Please pick your language from the following list. If your language is not listed, please inform your system administrator.') %]</p>
> 
>                 <form name="language" method="post" action="install.pl">
>                     <div class="form-group">
>-                        <label for="language">Select a language: </label>
>+                        <label for="language">[% t('Select a language:') %] </label>
>                         <select id="language" name="language">
>                             [% IF ( installer_languages_loop ) %]
>                                 [% FOREACH installer_languages_loo IN installer_languages_loop %]
>@@ -53,24 +54,24 @@
>             [% IF ( language ) %]
>                 [% UNLESS ( checkmodule ) %]
>                     [% IF ( missing_modules ) %]
>-                        <h2>Web installer &rsaquo; Perl modules missing</h2>
>-                        <p>Some Perl modules are missing. <span class="label label-danger">Important: </span>Required modules must be installed before you may continue.<br />
>+                        <h2>[% t('Web installer âº Perl modules missing') %]</h2>
>+                        <p>[% t('Some Perl modules are missing.') %] <span class="label label-danger">[% t('Important:') %] </span>[% t('Required modules must be installed before you may continue.') %]<br />
>                         <ul>
>                             [% FOREACH missing_module IN missing_modules %]
>-                                <li><strong>[% missing_module.name %]</strong> [% IF ( missing_module.require ) %]<span class="label label-danger">Required</span>[% END %]
>-                                    <br /> Version: [% missing_module.version %]
>-                                    <br /> Usage: [% missing_module.usage %]
>+                                <li><strong>[% missing_module.name %]</strong> [% IF ( missing_module.require ) %]<span class="label label-danger">[% t('Required') %]</span>[% END %]
>+                                    <br /> [% t('Version:') %] [% missing_module.version %]
>+                                    <br /> [% t('Usage:') %] [% missing_module.usage %]
>                                 </li>
>                             [% END %]
>                         </ul>
>                     [% END %]
> 
>                     [% IF ( problems ) %]
>-                        <h2>Web installer &rsaquo; Perl version too old</h2>
>-                        <p>I encountered some problems.</p>
>+                        <h2>[% t('Web installer âº Perl version too old') %]</h2>
>+                        <p>[% t('I encountered some problems.') %]</p>
>                         <ul>
>                             [% IF ( perlversion ) %]
>-                                <li>Your Perl version is out of date. Please upgrade to a newer version of Perl (at least version 5.10).</li>
>+                                <li>[% t('Your Perl version is out of date. Please upgrade to a newer version of Perl (at least version 5.10).') %]</li>
>                             [% END %]
>                         </ul>
>                     [% END %]
>@@ -81,9 +82,9 @@
>                     </form>
> 
>                 [% ELSE # IF checkmodule %]
>-                    <h2>Web installer &rsaquo; Check Perl dependencies</h2>
>-                    <p>All required Perl modules appear to be installed.</p>
>-                    <p> All dependencies installed.</p>
>+                    <h2>[% t('Web installer âº Check Perl dependencies') %]</h2>
>+                    <p>[% t('All required Perl modules appear to be installed.') %]</p>
>+                    <p> [% t('All dependencies installed.') %]</p>
> 
>                     <form name="checkmodules" role="form" action="install.pl">
>                         <input type="hidden" name="step" value="2" />
>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' %]<title>Koha &rsaquo; Web installer &rsaquo; Database settings</title>
>+[% INCLUDE 'doc-head-open.inc' %]<title>[% t('Koha âº Web installer âº Database settings') %]</title>
> [% INCLUDE 'installer-doc-head-close.inc' %]
> </head>
> 
>@@ -8,52 +9,52 @@
>         <div class="row">
>             <div id="installer-step2" class="installer-main col-sm-8 col-sm-offset-2 col-md-8 col-md-offset-2">
> 
>-                <h1 id="logo"><a href="#">Koha</a></h1>
>-                <h2>Web installer &rsaquo; Database settings</h2>
>-                <h3>Database settings:</h3>
>+                <h1 id="logo"><a href="#">[% t('Koha') %]</a></h1>
>+                <h2>[% t('Web installer âº Database settings') %]</h2>
>+                <h3>[% t('Database settings:') %]</h3>
>                 <ul>
>-                    <li><em>Database type: </em> [%- dbms | $HtmlTags tag=>'code' -%]</li>
>-                    <li><em>Database name: </em> [%- dbname | $HtmlTags tag=>'code' -%]</li>
>-                    <li><em>Database host: </em> [%- hostname | $HtmlTags tag=>'code'-%]</li>
>-                    <li><em>Database port: </em> [%- port| $HtmlTags tag=>'code' -%] (probably okay if blank)</li>
>-                    <li><em>Database user: </em> [%- user | $HtmlTags tag=>'code' -%]</li>
>+                    <li><em>[% t('Database type:') %] </em> [%- dbms | $HtmlTags tag=>'code' -%]</li>
>+                    <li><em>[% t('Database name:') %] </em> [%- dbname | $HtmlTags tag=>'code' -%]</li>
>+                    <li><em>[% t('Database host:') %] </em> [%- hostname | $HtmlTags tag=>'code'-%]</li>
>+                    <li><em>[% t('Database port:') %] </em> [%- port| $HtmlTags tag=>'code' -%] [% t('(probably okay if blank)') %]</li>
>+                    <li><em>[% t('Database user:') %] </em> [%- user | $HtmlTags tag=>'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>[% t('Connection established.') %]</p></div>
>                             [% IF ( checkdatabasecreated ) %]
>                                 <ul>
>-                                    <li>Database [% dbname | $HtmlTags tag=>'code'%] exists.</li>
>+                                    <li>[% t('Database') %] [% dbname | $HtmlTags tag=>'code'%] [% t('exists.') %]</li>
>                                 [% IF ( checkgrantaccess ) %]
>-                                    <li>User [% user | $HtmlTags tag=>'code' %]  has all required privileges on database [% dbname | $HtmlTags tag=>'code' %].</li>
>+                                    <li>[% t('User') %] [% user | $HtmlTags tag=>'code' %]  [% t('has all required privileges on database') %] [% dbname | $HtmlTags tag=>'code' %].</li>
>                                     </ul>
>                                 [% ELSE %]
>                                     </ul>
>-                                    <p class="error">User [% user | $HtmlTags tag=>'code' %] doesn't have enough privilege on database [% dbname | $HtmlTags tag=>'code'%].</p>
>-                                    <p class="tip">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' %].</p>
>-                                    <p>Need help? See manual for [% IF ( mysql ) %]
>-                                            <a href="http://dev.mysql.com/doc/refman/4.1/en/grant.html">MySQL</a>
>+                                    <p class="error">[% t('User') %] [% user | $HtmlTags tag=>'code' %] [% t('doesn\'t have enough privilege on database') %] [% dbname | $HtmlTags tag=>'code'%].</p>
>+                                    <p class="tip">[% 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' %].</p>
>+                                    <p>[% t('Need help? See manual for') %] [% IF ( mysql ) %]
>+                                            <a href="http://dev.mysql.com/doc/refman/4.1/en/grant.html">[% t('MySQL') %]</a>
>                                         [% ELSE %]
>-                                            <a href="http://www.postgresql.org/docs/8.2/interactive/sql-createrole.html">PostgreSQL</a>
>+                                            <a href="http://www.postgresql.org/docs/8.2/interactive/sql-createrole.html">[% t('PostgreSQL') %]</a>
>                                         [% END %]
>                                     </p>
>                                 [% END %]
>                             [% ELSE %]
>-                                <div class="alert alert-danger" role="alert"><p>No database named [% dbname | $HtmlTags tag=>'code' %] detected.</p></div>
>-                                <p>Please create the database before continuing.</p>
>+                                <div class="alert alert-danger" role="alert"><p>[% t('No database named') %] [% dbname | $HtmlTags tag=>'code' %] [% t('detected.') %]</p></div>
>+                                <p>[% t('Please create the database before continuing.') %]</p>
>                             [% END %]
>                         [% ELSE %]
>                             <div class="alert alert-warning" role="alert">[% error %] : [% message %]</div>
>                             <div class="tip">
>                                 <ul>
>-                                    <li>Check that your database is running.</li>
>-                                    <li>Check your database settings in [% 'koha-conf.xml' | $HtmlTags Tag=>'code' %].</li>
>-                                    <li>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' %].</li>
>+                                    <li>[% t('Check that your database is running.') %]</li>
>+                                    <li>[% t('Check your database settings in') %] [% 'koha-conf.xml' | $HtmlTags Tag=>'code' %].</li>
>+                                    <li>[% 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' %].</li>
>                                 </ul>
>                             </div>
>-                            <p>Please correct these errors. <a href="/cgi-bin/koha/installer/install.pl">Then start the installer again.</a>
>+                            <p>[% t('Please correct these errors.') %] <a href="/cgi-bin/koha/installer/install.pl">[% t('Then start the installer again.') %]</a>
>                         [% END %]
>                         [% UNLESS ( error ) %]
>                             <input type="hidden" name="step" value="3" />
>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' %]
> 
>-<title>Koha &rsaquo; Web installer &rsaquo;
>+<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 %]
> </title>
> 
>@@ -43,21 +44,21 @@
>     <div class="container-fluid">
>         <div class="row">
>             <div id="installer-step3" class="installer-main col-sm-8 col-sm-offset-2 col-md-8 col-md-offset-2">
>-                <h1 id="logo"><a href="#">Koha</a></h1>
>+                <h1 id="logo"><a href="#">[% t('Koha') %]</a></h1>
>                 [% IF ( finish ) %]
>-                    <h2>Web installer &rsaquo; Installation complete</h2>
>-                    <h3>Congratulations, installation complete</h3>
>-                    <p>This page will redirect in 10 seconds. <a href="/cgi-bin/koha/installer/onboarding.pl">If not, click here to start onboarding process.</a></p>
>+                    <h2>[% t('Web installer âº Installation complete') %]</h2>
>+                    <h3>[% t('Congratulations, installation complete') %]</h3>
>+                    <p>[% t('This page will redirect in 10 seconds.') %] <a href="/cgi-bin/koha/installer/onboarding.pl">[% t('If not, click here to start onboarding process.') %]</a></p>
>                 [% END %]
> 
>                 [% IF ( choosemarc ) %]
>-                    <h2>Select your MARC flavor</h2>
>+                    <h2>[% t('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" />
> 
>-                        <p>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. </p>
>+                        <p>[% 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.') %] </p>
> 
>                         [% FOREACH flavourloo IN flavourloop %]
>                             [% IF ( flavourloo.label == "Unimarc") %]
>@@ -75,17 +76,17 @@
>                 [% END # / IF choosemarc %]
> 
>                 [% IF ( selectframeworks ) %]
>-                    <h2>Web installer &rsaquo; Selecting default settings</h2>
>+                    <h2>[% t('Web installer âº Selecting default settings') %]</h2>
> 
> 
>                     <form name="frameworkselection" method="post" action="install.pl">
>                         <input type="hidden" name="step" value="3" />
>                         <input type="hidden" name="op" value="addframeworks" />
>                         [% IF ( frameworksloop ) %]
>-                            <h3>MARC frameworks: [% marcflavour %]</h3>
>+                            <h3>[% t('MARC frameworks:') %] [% marcflavour %]</h3>
>                             [% 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>
>+                                <h4><span class="error">[% t('No MARC frameworks are available for your language.') %]
>+                                [% t('Defaulting to the frameworks supplied for English (en)') %]<span></h4>
>                             [% END %]
>                             [% FOREACH frameworksloo IN frameworksloop %]
>                                 <h4>[% frameworksloo.label %]</h4>
>@@ -93,17 +94,17 @@
>                                 <div class="checkboxes">
> 
>                                     <p>
>-                                        <a class="selectall [% frameworksloo.label FILTER lower %]" href="#">Select all</a>
>-                                        <a class="deselectall [% frameworksloo.label FILTER lower %]" href="#">Select none</a>
>+                                        <a class="selectall [% frameworksloo.label FILTER lower %]" href="#">[% t('Select all') %]</a>
>+                                        <a class="deselectall [% frameworksloo.label FILTER lower %]" href="#">[% t('Select none') %]</a>
>                                     </p>
> 
>                                     [% FOREACH framework IN frameworksloo.frameworks %]
>                                         <div class="checkbox">
>                                             <label>
>                                                 [% IF ( framework.checked ) %]
>-                                                    <input type="checkbox" name="framework" value="[% framework.fwkfile %]" id ="[%framework.fwkname%]" checked="checked" />
>+                                                    <input type="checkbox" name="framework" value="[% framework.fwkfile %]" id="[%framework.fwkname%]" checked="checked" />
>                                                 [% ELSE %]
>-                                                    <input type="checkbox" name="framework" value="[% framework.fwkfile %]" id ="[%framework.fwkname%]" />
>+                                                    <input type="checkbox" name="framework" value="[% framework.fwkfile %]" id="[%framework.fwkname%]" />
>                                                 [% END %]
>                                                 [% framework.fwkdescription %]
>                                                 <em>([% framework.fwkname %])</em>
>@@ -115,11 +116,11 @@
>                             [% END # / FOREACH frameworksloo %]
>                         [% END # / IF frameworkdsloop %]
> 
>-                        <h3>Other data</h3>
>+                        <h3>[% t('Other data') %]</h3>
> 
>                         [% IF ( en_sample_data ) %]
>-                            <h4><span class="error">No sample data and settings are available for your language.
>-                            Defaulting to the samples supplied for English (en)<span></h4>
>+                            <h4><span class="error">[% t('No sample data and settings are available for your language.') %]
>+                            [% t('Defaulting to the samples supplied for English (en)') %]<span></h4>
>                         [% END %]
> 
>                         [% FOREACH levelloo IN levelloop %]
>@@ -128,8 +129,8 @@
>                             <div class="checkboxes">
> 
>                                 <p>
>-                                    <a class="selectall [% levelloo.label FILTER lower %]" href="#">Select all</a>
>-                                    <a class="deselectall [% levelloo.label FILTER lower %]" href="#">Select none</a>
>+                                    <a class="selectall [% levelloo.label FILTER lower %]" href="#">[% t('Select all') %]</a>
>+                                    <a class="deselectall [% levelloo.label FILTER lower %]" href="#">[% t('Select none') %]</a>
>                                 </p>
> 
>                                 [% FOREACH framework IN levelloo.frameworks %]
>@@ -148,23 +149,23 @@
>                             </div>
>                         [% END # / FOREACH levelloo %]
> 
>-                        <p>When you've made your selections, please click 'Import' below to begin the process. It may take a while to complete. Please be patient.</p>
>+                        <p>[% t('When you\'ve made your selections, please click \'Import\' below to begin the process. It may take a while to complete. Please be patient.') %]</p>
> 
>                         <p><input type="submit" value="Import" class="btn btn-primary" /></p>
>                     </form>
>                 [% END # / IF selectframeworks %]
> 
>                 [% IF ( addframeworks ) %]
>-                    <h2>Web installer &rsaquo; Default data loaded</h2>
>+                    <h2>[% t('Web installer âº Default data loaded') %]</h2>
>                     [% FOREACH lis IN list %]
>                         [% IF lis.level == 'mandatory' %]
>-                            <h3>Mandatory data added</h3>
>+                            <h3>[% t('Mandatory data added') %]</h3>
>                         [% ELSIF lis.level == 'optional' %]
>-                            <h3>Optional data added</h3>
>+                            <h3>[% t('Optional data added') %]</h3>
>                         [% ELSIF lis.level == 'mysql' %]
>-                            <h3>MySQL data added</h3>
>+                            <h3>[% t('MySQL data added') %]</h3>
>                         [% ELSE %]
>-                            <h3>[% lis.level FILTER ucfirst %] data added</h3>
>+                            <h3>[% lis.level FILTER ucfirst %] [% t('data added') %]</h3>
>                         [% END %]
>                         <ul>
>                             [% FOREACH fwklis IN lis.fwklist %]
>@@ -176,16 +177,16 @@
>                         </ul>
>                     [% END %]
> 
>-                    <h3>Basic installation complete.</h3>
>+                    <h3>[% t('Basic installation complete.') %]</h3>
> 
>-                    <p>In the next steps you will be guided through some basic requirements like defining Koha user with all administrative privileges (superlibrarian).</p>
>+                    <p>[% t('In the next steps you will be guided through some basic requirements like defining Koha user with all administrative privileges (superlibrarian).') %]</p>
> 
>                     <form action="/cgi-bin/koha/installer/install.pl" method="post" name="finish">
>                         <h4>
>-                            You can help the Koha community by sharing your statistics with us.
>+                            [% t('You can help the Koha community by sharing your statistics with us.') %]
>                         </h4>
>                         <p>
>-                            If you wish to share some of your data, please enable the functionality in the "Share your usage statistics" section of the Administration module.
>+                            [% t('If you wish to share some of your data, please enable the functionality in the &#34;Share your usage statistics&#34; section of the Administration module.') %]
>                         </p>
> 
>                         <input type="hidden" name="step" value="3" />
>@@ -199,12 +200,12 @@
> 
>                 [% IF ( importdatastructure ) %]
>                     [% IF ( error ) %]
>-                        <p>The following error occurred while importing the database structure:</p>
>+                        <p>[% t('The following error occurred while importing the database structure:') %]</p>
>                         <div class="alert alert-warning"><p>[% error %] </p></div>
>-                        <p>Please contact your system administrator</p>
>+                        <p>[% t('Please contact your system administrator') %]</p>
>                     [% ELSE %]
>-                        <h2>Web installer &rsaquo; Success</h2>
>-                        <div class="alert alert-success"><p>Database tables created</p></div>
>+                        <h2>[% t('Web installer âº Success') %]</h2>
>+                        <div class="alert alert-success"><p>[% t('Database tables created') %]</p></div>
>                         <form action="install.pl" method="post">
>                             <input type="hidden" name="step" value="3" />
>                             <p><input value="Continue to the next step" class="btn btn-primary" type="submit" /></p>
>@@ -213,8 +214,8 @@
>                 [% END # / IF importdatastructure %]
> 
>                 [% IF ( proposeimport ) %]
>-                    <h2>Web installer &rsaquo; Set up database</h2>
>-                    <p>Now we're ready to create the database tables and fill them with some default data.</p>
>+                    <h2>[% t('Web installer âº Set up database') %]</h2>
>+                    <p>[% t('Now we\'re ready to create the database tables and fill them with some default data.') %]</p>
>                     <form action="install.pl" method="post">
>                         <input type="hidden" name="step" value="3" />
>                         <input type="hidden" name="op" value="importdatastructure" />
>@@ -224,20 +225,20 @@
> 
>                 [% IF ( default ) %]
>                     [% IF ( upgrading ) %]
>-                        <h2>Web installer &rsaquo; Update database</h2>
>-                        <p>We are upgrading from Koha [% dbversion %] to [% kohaversion %]</p>
>-                        <p><a href="install.pl?step=3&amp;op=updatestructure" class="btn btn-primary">Update your database</a></p>
>+                        <h2>[% t('Web installer âº Update database') %]</h2>
>+                        <p>[% t('We are upgrading from Koha') %] [% dbversion %] [% t('to') %] [% kohaversion %]</p>
>+                        <p><a href="install.pl?step=3&op=updatestructure" class="btn btn-primary">[% t('Update your database') %]</a></p>
>                     [% ELSE %]
>-                        <h2>Web installer &rsaquo; Install basic configuration settings</h2>
>-                        <p>We are ready to do some basic configuration.</p>
>-                        <p><a href="install.pl?step=3&amp;op=choosemarc" class="btn btn-primary">Continue to the next step</a></p>
>+                        <h2>[% t('Web installer âº Install basic configuration settings') %]</h2>
>+                        <p>[% t('We are ready to do some basic configuration.') %]</p>
>+                        <p><a href="install.pl?step=3&op=choosemarc" class="btn btn-primary">[% t('Continue to the next step') %]</a></p>
>                     [% END %]
>                 [% END # / IF default %]
> 
>                 [% IF ( updatestructure ) %]
>-                    <h2>Updating database structure</h2>
>+                    <h2>[% t('Updating database structure') %]</h2>
>                     [% IF ( has_update_succeeds ) %]
>-                        <p>Update report :</p>
>+                        <p>[% t('Update report :') %]</p>
>                         <ul>
>                             [% FOREACH update_repor IN update_report %]
>                                 <li>[% update_repor.line |html %]</li>
>@@ -245,7 +246,7 @@
>                         </ul>
>                     [% END %]
>                     [% IF ( has_update_errors ) %]
>-                        <p>Update errors :</p>
>+                        <p>[% t('Update errors :') %]</p>
>                         <ul>
>                             [% FOREACH update_error IN update_errors %]
>                                 <li class="update_error">[% update_error.line |html %]</li>
>@@ -253,9 +254,9 @@
>                         </ul>
>                     [% END %]
>                     [% UNLESS ( has_update_errors ) %]
>-                        <p>Everything went okay. Update done.</p>
>+                        <p>[% t('Everything went okay. Update done.') %]</p>
>                     [% END %]
>-                    <p><a href="install.pl?step=3&amp;op=finished" class="btn btn-primary">Continue to log in to Koha</a></p>
>+                    <p><a href="install.pl?step=3&op=finished" class="btn btn-primary">[% t('Continue to log in to Koha') %]</a></p>
>                [% END # / IF updatestructure %]
>             </div> 
>         </div> 
>-- 
>2.17.1

Actions: View | Diff | Splinter Review

Attachments on bug 20988: 76333 | 76334 | 76335 | 76336 | 76337 | 76338 | 76339 | 76340 | 76341 | 76342 | 76343 | 76344 | 76345 | 76346 | 76347 | 76348 | 76349 | 76350 | 76351 | 76352 | 76353 | 76354 | 76355 | 76356 | 76357 | 76358 | 76359 | 76360 | 76361 | 76362 | 76363 | 76364 | 76365 | 76934 | 76935