From 9a3d12e35e20766a2175c68f870a48058a25d6ec Mon Sep 17 00:00:00 2001
From: Tomas Cohen Arazi <tomascohen@theke.io>
Date: Wed, 11 Apr 2018 15:47:01 -0300
Subject: [PATCH] Bug 18674: (QA follow-up) Add date and time

This patch adds current date and time, formatted as configured.
It makes the timezone name be displayed the system uses it (important
for the 'local' use case).

It removes some warnings too.

Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
---
 about.pl                                         |   13 +++++++++----
 koha-tmpl/intranet-tmpl/prog/en/modules/about.tt |    5 +++++
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/about.pl b/about.pl
index 7ea8acd..3997d49 100755
--- a/about.pl
+++ b/about.pl
@@ -37,6 +37,7 @@ use C4::Context;
 use C4::Installer;
 
 use Koha;
+use Koha::DateUtils qw(dt_from_string output_pref);
 use Koha::Acquisition::Currencies;
 use Koha::Patron::Categories;
 use Koha::Patrons;
@@ -62,9 +63,9 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
     }
 );
 
-my $config_timezone = C4::Context->config('timezone');
+my $config_timezone = C4::Context->config('timezone') // '';
 my $config_invalid  = !DateTime::TimeZone->is_valid_name( $config_timezone );
-my $env_timezone    = $ENV{TZ};
+my $env_timezone    = $ENV{TZ} // '';
 my $env_invalid     = !DateTime::TimeZone->is_valid_name( $env_timezone );
 my $actual_bad_tz_fallback = 0;
 
@@ -81,14 +82,18 @@ elsif ( $config_timezone eq '' &&
 }
 
 my $time_zone = {
-    actual                 => C4::Context->timezone(),
+    actual                 => C4::Context->tz->name,
     actual_bad_tz_fallback => $actual_bad_tz_fallback,
     config                 => $config_timezone,
     config_invalid         => $config_invalid,
     environment            => $env_timezone,
     environment_invalid    => $env_invalid
 };
-$template->param( 'time_zone' => $time_zone );
+
+$template->param(
+    time_zone              => $time_zone,
+    current_date_and_time  => output_pref({ dt => dt_from_string(), dateformat => 'iso' })
+);
 
 my $perl_path = $^X;
 if ($^O ne 'VMS') {
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/about.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/about.tt
index e109eb0..8feceb3 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/about.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/about.tt
@@ -1,5 +1,6 @@
 [% USE HtmlTags %]
 [% USE Koha %]
+[% USE KohaDates %]
 [% SET footerjs = 1 %]
 [% INCLUDE 'doc-head-open.inc' %]
 <title>Koha &rsaquo; About Koha</title>
@@ -112,6 +113,10 @@
             <tr><th scope="row"><b>Warning</b> </th><td>Error message from Zebra: [% ( errZebraConnection ) %] </td></tr>
             [% END %]
             <tr>
+              <th scope="row">Date and time: </th>
+              <td>[% current_date_and_time | $KohaDates with_hours => 1 %]</td>
+            </tr>
+            <tr>
               [% timezone_config_class = (time_zone.config_invalid) ? 'status_warn' : '' %]
               [% timezone_env_class    = (time_zone.env_invalid)    ? 'status_warn' : '' %]
               <th scope="row">Time zone: </th>
-- 
1.7.2.5