diff options
author | Louise Crow <louise.crow@gmail.com> | 2014-02-18 17:10:31 +0000 |
---|---|---|
committer | Louise Crow <louise.crow@gmail.com> | 2014-03-13 17:12:49 +0000 |
commit | 2ec251249d62298f974c3945ec9b88afa5997310 (patch) | |
tree | 9e9282775d5071f854044508985c97174ffc98f2 /app/controllers/services_controller.rb | |
parent | f648530b98c820cde92d6d2cddda896013d76558 (diff) |
Handle the case where the current locale isn't in site list
We only really want to redirect people to live sites, so pre-launch
sites don't belong in WorldFOIWebsites. Handle the case where the
current locale isn't there. Closes #1345.
Diffstat (limited to 'app/controllers/services_controller.rb')
-rw-r--r-- | app/controllers/services_controller.rb | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/app/controllers/services_controller.rb b/app/controllers/services_controller.rb index 78c494dba..97c47c448 100644 --- a/app/controllers/services_controller.rb +++ b/app/controllers/services_controller.rb @@ -17,8 +17,15 @@ class ServicesController < ApplicationController text = _("Hello! You can make Freedom of Information requests within {{country_name}} at {{link_to_website}}", :country_name => found_country[:country_name], :link_to_website => "<a href=\"#{found_country[:url]}\">#{found_country[:name]}</a>".html_safe) else - current_country = WorldFOIWebsites.by_code(iso_country_code)[:country_name] - text = _("Hello! We have an <a href=\"/help/alaveteli?country_name=#{CGI.escape(current_country)}\">important message</a> for visitors outside {{country_name}}", :country_name => current_country) + country_data = WorldFOIWebsites.by_code(iso_country_code) + if country_data + text = _("Hello! We have an <a href=\"{{url}}\">important message</a> for visitors outside {{country_name}}", + :country_name => country_data[:country_name], + :url => "/help/alaveteli?country_name=#{CGI.escape(country_data[:country_name])}") + else + text = _("Hello! We have an <a href=\"{{url}}\">important message</a> for visitors in other countries", + :url => "/help/alaveteli") + end end ensure FastGettext.locale = old_fgt_locale |