Merge branch 'release/0.9'0.9

Conflicts:
    locale/cs/app.po
    locale/he_IL/app.po
    locale/id/app.po
    locale/it/app.po
    locale/ro_RO/app.po
    locale/uk/app.po

1 files changed, 5 insertions, 5 deletions

diff --git a/spec/controllers/admin_public_body_controller_spec.rb b/spec/controllers/admin_public_body_controller_spec.rb
index 28182a3cd..317c186fa 100644
--- a/spec/controllers/admin_public_body_controller_spec.rb
+++ b/spec/controllers/admin_public_body_controller_spec.rb
@@ -301,7 +301,7 @@ describe AdminPublicBodyController, "when administering public bodies with i18n"
     end
 
     it "saves edits to a public body" do
-        PublicBody.with_locale(:es) do
+        I18n.with_locale(:es) do
             pb = PublicBody.find(id=3)
             pb.name.should == "El Department for Humpadinking"
             post :update, {
@@ -321,10 +321,10 @@ describe AdminPublicBodyController, "when administering public bodies with i18n"
         end
 
         pb = PublicBody.find(public_bodies(:humpadink_public_body).id)
-        PublicBody.with_locale(:es) do
+        I18n.with_locale(:es) do
            pb.name.should == "Renamed"
         end
-        PublicBody.with_locale(:en) do
+        I18n.with_locale(:en) do
            pb.name.should == "Department for Humpadinking"
         end
     end
@@ -370,12 +370,12 @@ describe AdminPublicBodyController, "when creating public bodies with i18n" do
 
         body = PublicBody.find_by_name("New Quango")
         body.translations.map {|t| t.locale.to_s}.sort.should == ["en", "es"]
-        PublicBody.with_locale(:en) do
+        I18n.with_locale(:en) do
             body.name.should == "New Quango"
             body.url_name.should == "new_quango"
             body.first_letter.should == "N"
         end
-        PublicBody.with_locale(:es) do
+        I18n.with_locale(:es) do
             body.name.should == "Mi Nuevo Quango"
             body.url_name.should == "mi_nuevo_quango"
             body.first_letter.should == "M"