diff options
| author | Matthew Landauer <matthew@openaustralia.org> | 2013-01-31 08:21:22 +1100 |
|---|---|---|
| committer | Matthew Landauer <matthew@openaustralia.org> | 2013-01-31 08:31:44 +1100 |
| commit | 6df81c66932773b4a461816c9cd6b85cf7157776 (patch) | |
| tree | 88c2ba867afab54251bc8a33136ec05a17c6b940 /spec/models | |
| parent | 26c9c6a3f0f5bb33fa52841d5854bf52b7cf2e20 (diff) | |
| parent | afa9ef14323dfbfd412f0c8872e0b3736d60e7a3 (diff) | |
Merge branch 'i18n_rails3_preparation' into rails-3-spike
Conflicts:
Gemfile.lock
app/controllers/general_controller.rb
app/controllers/public_body_controller.rb
spec/controllers/public_body_controller_spec.rb
Diffstat (limited to 'spec/models')
| -rw-r--r-- | spec/models/public_body_spec.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/models/public_body_spec.rb b/spec/models/public_body_spec.rb index f247f561c..0b1bfccd7 100644 --- a/spec/models/public_body_spec.rb +++ b/spec/models/public_body_spec.rb @@ -378,7 +378,7 @@ describe PublicBody, " when loading CSV files" do PublicBody.count.should == original_count + 3 - # XXX Not sure why trying to do a PublicBody.with_locale fails here. Seems related to + # XXX Not sure why trying to do a I18n.with_locale fails here. Seems related to # the way categories are loaded every time from the PublicBody class. For now we just # test some translation was done. body = PublicBody.find_by_name('North West Fake Authority') |