From 09246dbbdb77f16687d5ccbdfbe4a55b32a7170e Mon Sep 17 00:00:00 2001 From: Alex Buckley Date: Sun, 9 Apr 2017 05:30:05 +0000 Subject: [PATCH] Bug 17855 - Followup patch following requests in comments 176 and 177 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Marc Véron Signed-off-by: Jonathan Druart --- installer/onboarding.pl | 4 ++-- koha-tmpl/intranet-tmpl/prog/en/modules/installer/step3.tt | 6 +++--- .../intranet-tmpl/prog/en/modules/onboarding/onboardingstep2.tt | 2 +- .../intranet-tmpl/prog/en/modules/onboarding/onboardingstep5.tt | 8 ++++---- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/installer/onboarding.pl b/installer/onboarding.pl index 49f4e84..d8de8ef 100755 --- a/installer/onboarding.pl +++ b/installer/onboarding.pl @@ -189,7 +189,7 @@ elsif ( $step && $step == 2 ) { $enrolmentperioddate = output_pref( { dt => dt_from_string($enrolmentperioddate), - dateformat => 'iso', + dateformat => 'DateTime', dateonly => 1, } ); @@ -204,7 +204,7 @@ elsif ( $step && $step == 2 ) { category_type => $category_type, default_privacy => $default_privacy, enrolmentperiod => $enrolmentperiod, - enrolmentperioddate => $enrolmentperioddate, + enrolmentperioddate => $enrolmentperioddate } ); 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 4f655ae..99f9b74 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/installer/step3.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/installer/step3.tt @@ -224,13 +224,13 @@ function Hide(link)

We are upgrading from Koha [% dbversion %] to [% kohaversion %], you must update your database.
- + Update your database

[% ELSE %]

We are ready to do some basic configuration. Please install some basic configuration settings to continue the installation:

- + Install basic configuration settings [% END %] [% END %] @@ -256,7 +256,7 @@ function Hide(link) [% UNLESS ( has_update_errors ) %]

Everything went OK, update done.

[% END %] - +Continue to log in to Koha [% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep2.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep2.tt index f0e90aa..2b82d44 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep2.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep2.tt @@ -147,7 +147,7 @@ jQuery.validator.addMethod( "enrollment_period", function(){
  1. - months + months
  2. diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep5.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep5.tt index 81ba89c..bad9a2a 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep5.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep5.tt @@ -71,13 +71,13 @@
  3. - + Required
  4. - + Required
  5. @@ -101,13 +101,13 @@
  6. - + Required
  7. - + Required
    8. -- 2.9.3