Browse Source

Fixes 4715 - Timezone for Iceland missing from dropdown.

Martin Gruner 1 year ago
parent
commit
ba0385e654
2 changed files with 7 additions and 1 deletions
  1. 1 1
      app/models/calendar.rb
  2. 6 0
      spec/models/calendar_spec.rb

+ 1 - 1
app/models/calendar.rb

@@ -115,7 +115,7 @@ returns
 
   def self.timezones
     list = {}
-    TZInfo::Timezone.all_country_zone_identifiers.each do |timezone|
+    TZInfo::Timezone.all_identifiers.each do |timezone|
       t = ActiveSupport::TimeZone.find_tzinfo(timezone)
       diff = t.current_period.utc_total_offset / 60 / 60
       list[ timezone ] = diff

+ 6 - 0
spec/models/calendar_spec.rb

@@ -455,4 +455,10 @@ RSpec.describe Calendar, type: :model do
       end
     end
   end
+
+  describe '.timezones' do
+    it 'includes known zones' do
+      expect(described_class.timezones.keys).to include('GMT', 'Europe/Berlin', 'Atlantic/Reykjavik')
+    end
+  end
 end