aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport/lib/active_support.rb
diff options
context:
space:
mode:
authorSven Fuchs <svenfuchs@artweb-design.de>2008-06-21 11:27:19 +0200
committerSven Fuchs <svenfuchs@artweb-design.de>2008-06-21 11:27:19 +0200
commitc1e2506494107892a0962b8491cd234f77949c08 (patch)
treeaa333cb3d8a6ff05088b6a524e30f04169aaf5f5 /activesupport/lib/active_support.rb
parent585c8c17c303fc46fcf014a644a541eae6cb5ffd (diff)
downloadrails-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 'activesupport/lib/active_support.rb')
-rw-r--r--activesupport/lib/active_support.rb5
1 files changed, 4 insertions, 1 deletions
diff --git a/activesupport/lib/active_support.rb b/activesupport/lib/active_support.rb
index acdb3056d2..0de948dda9 100644
--- a/activesupport/lib/active_support.rb
+++ b/activesupport/lib/active_support.rb
@@ -55,7 +55,10 @@ require 'active_support/multibyte'
require 'active_support/base64'
require 'active_support/time_with_zone'
-require 'active_support/lang/en-US.rb'
+
+I18n.backend.populate do
+ require 'active_support/lang/en-US.rb'
+end
Inflector = ActiveSupport::Deprecation::DeprecatedConstantProxy.new('Inflector', 'ActiveSupport::Inflector')
Dependencies = ActiveSupport::Deprecation::DeprecatedConstantProxy.new('Dependencies', 'ActiveSupport::Dependencies')