Merge branch 'release/0.6'0.6

Conflicts:
	locale/bs/app.po
	locale/ca/app.po
	locale/cs/app.po
	locale/cy/app.po
	locale/de/app.po
	locale/en_IE/app.po
	locale/es/app.po
	locale/eu/app.po
	locale/fr/app.po
	locale/ga_IE/app.po
	locale/gl/app.po
	locale/hu_HU/app.po
	locale/id/app.po
	locale/pt_BR/app.po
	locale/sq/app.po
	locale/sr@latin/app.po
	spec/fixtures/locale/en/app.po

1 files changed, 14 insertions, 0 deletions

diff --git a/app/controllers/services_controller.rb b/app/controllers/services_controller.rb
index 225790d71..00c0e61bd 100644
--- a/app/controllers/services_controller.rb
+++ b/app/controllers/services_controller.rb
@@ -9,16 +9,30 @@ 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>'
         end
         render :text => text, :content_type => "text/plain"  # XXX workaround the HTML validation in test suite
     end
+    def hidden_user_explanation
+        info_request = InfoRequest.find(params[:info_request_id])
+        render :template => "admin_request/hidden_user_explanation", 
+               :content_type => "text/plain",
+               :layout => false,
+               :locals => {:name_to => info_request.user.name, 
+                          :name_from => MySociety::Config.get("CONTACT_NAME", 'Alaveteli'), 
+                          :info_request => info_request, :reason => params[:reason],
+                          :info_request_url => 'http://' + MySociety::Config.get('DOMAIN') + request_url(info_request),
+                          :site_name => site_name}
+    end
 end