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, 5 insertions, 3 deletions

diff --git a/spec/controllers/services_controller_spec.rb b/spec/controllers/services_controller_spec.rb
index 1bafd0c8f..2be382258 100644
--- a/spec/controllers/services_controller_spec.rb
+++ b/spec/controllers/services_controller_spec.rb
@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 
 describe ServicesController, "when using web services" do
@@ -16,15 +17,16 @@ describe ServicesController, "when using web services" do
         config['ISO_COUNTRY_CODE'] = "DE"
         controller.stub!(:country_from_ip).and_return('ZZ')
         get :other_country_message
-        response.body.should match(/outside Germany/)
+        response.body.should match(/outside Deutschland/)
     end
 
     it "should show link to other FOI website when not in the deployed country" do
         config = MySociety::Config.load_default()
         config['ISO_COUNTRY_CODE'] = "ZZ"
-        controller.stub!(:country_from_ip).and_return('DE')
+        controller.stub!(:country_from_ip).and_return('ES')
+        request.env['HTTP_ACCEPT_LANGUAGE'] = "es"
         get :other_country_message
-        response.body.should match(/within Germany/)
+        response.body.should match(/Puede hacer solicitudes de información en España/)
     end