Refs #5493; Show Timezone on JPs editor5493-use-tz-for-time-display

2 files changed, 2 insertions, 1 deletions

diff --git a/app/controllers/journey_patterns_collections_controller.rb b/app/controllers/journey_patterns_collections_controller.rb
index b37ac6cd0..da567779e 100644
--- a/app/controllers/journey_patterns_collections_controller.rb
+++ b/app/controllers/journey_patterns_collections_controller.rb
@@ -44,6 +44,7 @@ class JourneyPatternsCollectionsController < ChouetteController
             :zip_code => sp.stop_area.try(:zip_code),
             :city_name => sp.stop_area.try(:city_name),
             :country_name => sp.stop_area.try(:country_name),
+            :time_zone_formatted_offset => sp.stop_area.try(:time_zone_formatted_offset),
             :comment => sp.stop_area.try(:comment),
             :area_type => sp.stop_area.try(:area_type),
             :registration_number => sp.stop_area.try(:registration_number),
diff --git a/app/models/chouette/stop_area.rb b/app/models/chouette/stop_area.rb
index b16bbb487..37d20ae02 100644
--- a/app/models/chouette/stop_area.rb
+++ b/app/models/chouette/stop_area.rb
@@ -368,7 +368,7 @@ module Chouette
 
     def time_zone_formatted_offset
       return nil unless time_zone.present?
-      ActiveSupport::TimeZone[time_zone].formatted_offset
+      ActiveSupport::TimeZone[time_zone]&.formatted_offset
     end
   end
 end