Merge branch 'release/0.6.3' into wdtk

Conflicts:
    app/controllers/admin_request_controller.rb
    app/views/request/show.rhtml
    spec/models/info_request_spec.rb

1 files changed, 12 insertions, 2 deletions

diff --git a/spec/controllers/services_controller_spec.rb b/spec/controllers/services_controller_spec.rb
index 2be382258..a701ae247 100644
--- a/spec/controllers/services_controller_spec.rb
+++ b/spec/controllers/services_controller_spec.rb
@@ -2,8 +2,15 @@
 require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 
 describe ServicesController, "when using web services" do
+
     integrate_views
-  
+
+    # store and restore the locale in the context of the test suite to isolate
+    # changes made in these tests
+    before do
+        @old_locale = FastGettext.locale()
+    end
+
     it "should show no alaveteli message when in the deployed country" do
         config = MySociety::Config.load_default()
         config['ISO_COUNTRY_CODE'] = "DE"
@@ -29,5 +36,8 @@ describe ServicesController, "when using web services" do
         response.body.should match(/Puede hacer solicitudes de información en España/)
     end
 
+    after do
+        FastGettext.set_locale(@old_locale)
+    end
 
-end
+end
\ No newline at end of file