aboutsummaryrefslogtreecommitdiffstats
path: root/app/models
diff options
context:
space:
mode:
authorGareth Rees <gareth@mysociety.org>2015-04-30 10:09:34 +0100
committerGareth Rees <gareth@mysociety.org>2015-04-30 10:09:34 +0100
commit4246e8de08d3ab8a86806b74ad422a1be431f4e3 (patch)
treeb9a22d6e561f9da339d8e29dd8d17d8e7ed2bea5 /app/models
parent2f2415d8d126423c17dd85d29f8fb543b56b946d (diff)
parent196cce975887aca513b0fca6e90f8024aff981e5 (diff)
Merge branch 'hotfix/0.21.0.24'0.21.0.24
Diffstat (limited to 'app/models')
-rw-r--r--app/models/holiday_import.rb12
1 files changed, 8 insertions, 4 deletions
diff --git a/app/models/holiday_import.rb b/app/models/holiday_import.rb
index c6019fac0..98a9b96fc 100644
--- a/app/models/holiday_import.rb
+++ b/app/models/holiday_import.rb
@@ -84,10 +84,14 @@ class HolidayImport
end
def populate_from_suggestions
- holiday_info = Holidays.between(start_date, end_date, @country_code.to_sym, :observed)
- holiday_info.each do |holiday_info_hash|
- holidays << Holiday.new(:description => holiday_info_hash[:name],
- :day => holiday_info_hash[:date])
+ begin
+ holiday_info = Holidays.between(start_date, end_date, @country_code.to_sym, :observed)
+ holiday_info.each do |holiday_info_hash|
+ holidays << Holiday.new(:description => holiday_info_hash[:name],
+ :day => holiday_info_hash[:date])
+ end
+ rescue Holidays::UnknownRegionError
+ []
end
end
end