Make the logic that tells you about other countries' Alavetelis prefer the browser language; and make the tests pass.

1 files changed, 3 insertions, 0 deletions

diff --git a/app/controllers/services_controller.rb b/app/controllers/services_controller.rb
index 28dd2143d..00c0e61bd 100644
--- a/app/controllers/services_controller.rb
+++ b/app/controllers/services_controller.rb
@@ -9,12 +9,15 @@ class ServicesController < ApplicationController
         if country_from_ip.downcase != iso_country_code
             found_country = WorldFOIWebsites.by_code(country_from_ip)
             found_country_name = !found_country.nil? && found_country[:country_name]
+            old_locale = FastGettext.locale
+            FastGettext.locale = FastGettext.best_locale_in(request.env['HTTP_ACCEPT_LANGUAGE'])
             if found_country_name
                 text = _("Hello! You can make Freedom of Information requests within {{country_name}} at {{link_to_website}}", :country_name => found_country_name, :link_to_website => "<a href=\"#{found_country[:url]}\">#{found_country[:name]}</a>")
             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)
             end
+            FastGettext.locale = old_locale            
         end
         if !text.empty?
             text += ' <span class="close-button">X</span>'