diff options
| author | Louise Crow <louise.crow@gmail.com> | 2013-02-19 20:18:44 +0000 |
|---|---|---|
| committer | Louise Crow <louise.crow@gmail.com> | 2013-02-19 20:18:44 +0000 |
| commit | 2a193d3bc74b812bd9ddee9d7520ca1e98007511 (patch) | |
| tree | 22b83d0df9febb132088598a7170cbc58f576d81 | |
| parent | 3bc4b810c11d80474714060b7f10236d31edfae3 (diff) | |
| parent | 1617f4e89b66297cd8f97a10c2bf02203b792871 (diff) | |
Merge remote-tracking branch 'openaustralia_github/country_message_escaping_fix' into develop
| -rw-r--r-- | app/controllers/services_controller.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/services_controller.rb b/app/controllers/services_controller.rb index 1db5348c7..a27e71264 100644 --- a/app/controllers/services_controller.rb +++ b/app/controllers/services_controller.rb @@ -15,7 +15,7 @@ class ServicesController < ApplicationController FastGettext.locale = FastGettext.best_locale_in(request.env['HTTP_ACCEPT_LANGUAGE']) if found_country && found_country[:country_name] && found_country[:url] && found_country[:name] 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>") + :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) |