Merge tag 'v1.6.1' into fiksgatami-dev

1 files changed, 20 insertions, 0 deletions

diff --git a/perllib/FixMyStreet.pm b/perllib/FixMyStreet.pm
index f3b72c4d0..76760b967 100644
--- a/perllib/FixMyStreet.pm
+++ b/perllib/FixMyStreet.pm
@@ -6,6 +6,7 @@ use warnings;
 use Path::Class;
 my $ROOT_DIR = file(__FILE__)->parent->parent->absolute->resolve;
 
+use DateTime::TimeZone;
 use Readonly;
 use Sub::Override;
 
@@ -217,4 +218,23 @@ sub get_email_template {
     return $template;
 }
 
+my $tz = DateTime::TimeZone->new( name => "local" );
+my $tz_f;
+$tz_f = DateTime::TimeZone->new( name => FixMyStreet->config('TIME_ZONE') )
+    if FixMyStreet->config('TIME_ZONE');
+
+sub local_time_zone {
+    return $tz;
+}
+
+sub time_zone {
+    return $tz_f;
+}
+
+sub set_time_zone {
+    my ($class, $dt)  = @_;
+    $dt->set_time_zone($tz);
+    $dt->set_time_zone($tz_f) if $tz_f;
+}
+
 1;