diff options
| author | Sven Fuchs <svenfuchs@artweb-design.de> | 2008-06-21 11:27:19 +0200 |
|---|---|---|
| committer | Sven Fuchs <svenfuchs@artweb-design.de> | 2008-06-21 11:27:19 +0200 |
| commit | c1e2506494107892a0962b8491cd234f77949c08 (patch) | |
| tree | aa333cb3d8a6ff05088b6a524e30f04169aaf5f5 /activerecord/lib | |
| parent | 585c8c17c303fc46fcf014a644a541eae6cb5ffd (diff) | |
| download | rails-c1e2506494107892a0962b8491cd234f77949c08.tar.gz rails-c1e2506494107892a0962b8491cd234f77949c08.tar.bz2 rails-c1e2506494107892a0962b8491cd234f77949c08.zip | |
Changed process of storing translations from the
client libraries to the backend: clients now can pass a block to
backend#populate which can contain code to load and register translations.
This makes sense for backends that persist their translations (e.g. to db)
so the repeated loading and passing of translations throughout the server
startup would be wasted resources.
Diffstat (limited to 'activerecord/lib')
| -rwxr-xr-x | activerecord/lib/active_record.rb | 5 | ||||
| -rw-r--r-- | activerecord/lib/active_record/lang/en-US.rb | 2 |
2 files changed, 5 insertions, 2 deletions
diff --git a/activerecord/lib/active_record.rb b/activerecord/lib/active_record.rb index b379bd26f8..71882833d4 100755 --- a/activerecord/lib/active_record.rb +++ b/activerecord/lib/active_record.rb @@ -81,4 +81,7 @@ require 'active_record/connection_adapters/abstract_adapter' require 'active_record/schema_dumper' -require 'active_record/lang/en-US.rb' +I18n.backend.populate do + require 'active_record/lang/en-US.rb' +end + diff --git a/activerecord/lib/active_record/lang/en-US.rb b/activerecord/lib/active_record/lang/en-US.rb index f307f40f1a..b31e13ed3a 100644 --- a/activerecord/lib/active_record/lang/en-US.rb +++ b/activerecord/lib/active_record/lang/en-US.rb @@ -1,4 +1,4 @@ -I18n.backend.set_translations :'en-US', { +I18n.backend.store_translations :'en-US', { :active_record => { :error_messages => { :inclusion => "is not included in the list", |