diff options
| author | Louise Crow <louise.crow@gmail.com> | 2013-03-19 14:02:25 -0700 |
|---|---|---|
| committer | Louise Crow <louise.crow@gmail.com> | 2013-03-19 14:02:25 -0700 |
| commit | b394b67663916c865452cc784d8642f72a305be5 (patch) | |
| tree | 63c92172fe7813e6354da0ead628ed2192ef0ee2 /app/controllers/services_controller.rb | |
| parent | 8d21293461ce4b564261686ab8d6460f5fe51259 (diff) | |
| parent | f83b917ec2c59da0ce7c27da19b740366da58419 (diff) | |
Merge branch 'release/0.8' into wdtk
Conflicts:
app/controllers/admin_request_controller.rb
app/views/contact_mailer/from_admin_message.rhtml
Diffstat (limited to 'app/controllers/services_controller.rb')
| -rw-r--r-- | app/controllers/services_controller.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/controllers/services_controller.rb b/app/controllers/services_controller.rb index 1db5348c7..e75dac903 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) @@ -38,7 +38,7 @@ class ServicesController < ApplicationController :locals => {:name_to => info_request.user_name, :name_from => Configuration::contact_name, :info_request => info_request, :reason => params[:reason], - :info_request_url => 'http://' + Configuration::domain + request_url(info_request), + :info_request_url => 'http://' + Configuration::domain + request_path(info_request), :site_name => site_name} end |