Merge branch 'release/0.13'0.13

Conflicts:
    locale/bg/app.po
    locale/es/app.po
    locale/fi/app.po
    locale/fr/app.po
    locale/fr_CA/app.po
    locale/he_IL/app.po
    locale/hr/app.po
    locale/nb_NO/app.po
    locale/nl/app.po
    locale/pt_BR/app.po
    locale/ro_RO/app.po
    locale/sl/app.po
    locale/vi/app.po
    script/rails-post-deploy

1 files changed, 21 insertions, 19 deletions

diff --git a/spec/controllers/public_body_controller_spec.rb b/spec/controllers/public_body_controller_spec.rb
index e01bcb0a6..4e1841164 100644
--- a/spec/controllers/public_body_controller_spec.rb
+++ b/spec/controllers/public_body_controller_spec.rb
@@ -43,28 +43,20 @@ describe PublicBodyController, "when showing a body" do
             :conditions => ["public_body_id = ?", public_bodies(:humpadink_public_body).id])
     end
 
-    it "should redirect to the canonical name in the chosen locale" do
-        get :show, {:url_name => "dfh", :view => 'all', :show_locale => "es"}
-        response.should redirect_to "http://test.host/es/body/edfh"
+    it "should display the body using same locale as that used in url_name" do
+        get :show, {:url_name => "edfh", :view => 'all', :locale => "es"}
+        response.should contain("Baguette")
     end
 
-    it "should assign the body using same locale as that used in url_name" do
-        get :show, {:url_name => "edfh", :view => 'all', :show_locale => "es"}
-        response.should contain("Baguette")
+    it 'should show public body names in the selected locale language if present for a locale with underscores' do
+        AlaveteliLocalization.set_locales('he_IL en', 'en')
+        get :show, {:url_name => 'dfh', :view => 'all', :locale => 'he_IL'}
+        response.should contain('Hebrew Humpadinking')
     end
 
     it "should redirect use to the relevant locale even when url_name is for a different locale" do
-        RoutingFilter.active = false
-
         get :show, {:url_name => "edfh", :view => 'all'}
         response.should redirect_to "http://test.host/body/dfh"
-
-        RoutingFilter.active = true
-    end
-
-    it "should remember the filter (view) setting on redirecting" do
-        get :show, :show_locale => "es", :url_name => "tgq", :view => 'successful'
-        response.should redirect_to 'http://test.host/es/body/etgq/successful'
     end
 
     it "should redirect to newest name if you use historic name of public body in URL" do
@@ -95,12 +87,22 @@ describe PublicBodyController, "when listing bodies" do
                                           :last_edit_comment => '')
             @english_only.save
         end
-        I18n.with_locale(:es) do
-            get :list
-            assigns[:public_bodies].include?(@english_only).should == true
-        end
+        get :list, {:locale => 'es'}
+        assigns[:public_bodies].include?(@english_only).should == true
+    end
+
+    it 'should show public body names in the selected locale language if present' do
+        get :list, {:locale => 'es'}
+        response.should contain('El Department for Humpadinking')
     end
 
+    it 'should show public body names in the selected locale language if present for a locale with underscores' do
+        AlaveteliLocalization.set_locales('he_IL en', 'en')
+        get :list, {:locale => 'he_IL'}
+        response.should contain('Hebrew Humpadinking')
+    end
+
+
     it "should list bodies in alphabetical order" do
         # Note that they are alphabetised by localised name
         get :list