diff options
| author | Sven Fuchs <svenfuchs@artweb-design.de> | 2008-08-20 18:44:41 +0200 |
|---|---|---|
| committer | Sven Fuchs <svenfuchs@artweb-design.de> | 2008-08-20 18:44:41 +0200 |
| commit | c324ef2785f82f03bb0e703da27ba2b8d97a2da1 (patch) | |
| tree | 6a047af2d2917afa7fe6390ea106af750de715cb /activerecord/test/cases | |
| parent | fc0358ae16d5631dd1d996b2cf95a8987f9d0c8d (diff) | |
| parent | 950b9792baae14e42b894f113ae8dfc95df34da9 (diff) | |
| download | rails-c324ef2785f82f03bb0e703da27ba2b8d97a2da1.tar.gz rails-c324ef2785f82f03bb0e703da27ba2b8d97a2da1.tar.bz2 rails-c324ef2785f82f03bb0e703da27ba2b8d97a2da1.zip | |
Merge branch 'iain' into i18n
Diffstat (limited to 'activerecord/test/cases')
| -rw-r--r-- | activerecord/test/cases/validations_i18n_test.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/test/cases/validations_i18n_test.rb b/activerecord/test/cases/validations_i18n_test.rb index 469e9d6c03..96af3b17a6 100644 --- a/activerecord/test/cases/validations_i18n_test.rb +++ b/activerecord/test/cases/validations_i18n_test.rb @@ -11,7 +11,7 @@ class ActiveRecordValidationsI18nTests < Test::Unit::TestCase def teardown reset_callbacks Topic - I18n.load_translations File.dirname(__FILE__) + '/../../lib/active_record/locale/en-US.rb' + I18n.load_translations File.dirname(__FILE__) + '/../../lib/active_record/locale/en-US.yml' end def unique_topic |