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.
rails · Jun 21, 2008 · c1e2506 · c1e2506
1 parent 585c8c1
commit c1e2506
Show file tree

Hide file tree

Showing 9 changed files with 56 additions and 48 deletions.
diff --git a/actionpack/lib/action_view.rb b/actionpack/lib/action_view.rb
@@ -32,7 +32,9 @@
 require 'action_view/partials'
 require 'action_view/template_error'
 
-require 'action_view/lang/en-US.rb'
+I18n.backend.populate do
+  require 'action_view/lang/en-US.rb'
+end
 
 ActionView::Base.class_eval do
   include ActionView::Partials

diff --git a/actionpack/lib/action_view/lang/en-US.rb b/actionpack/lib/action_view/lang/en-US.rb
@@ -1,4 +1,4 @@
-I18n.backend.set_translations :'en-US', {
+I18n.backend.store_translations :'en-US', {
   :date => {
     :formats => {
       :default => "%Y-%m-%d",

diff --git a/actionpack/test/template/number_helper_i18n_test.rb b/actionpack/test/template/number_helper_i18n_test.rb
@@ -7,7 +7,7 @@ class NumberHelperI18nTests < Test::Unit::TestCase
   def setup
     @request = mock
     @defaults = {:separator => ".", :unit => "$", :format => "%u%n", :delimiter => ",", :precision => 2}
-    I18n.backend.set_translations 'en-US', :currency => {:format => @defaults}
+    I18n.backend.store_translations 'en-US', :currency => {:format => @defaults}
   end
 
   def test_number_to_currency_given_a_locale_it_does_not_check_request_for_locale

diff --git a/activerecord/lib/active_record.rb b/activerecord/lib/active_record.rb
@@ -81,4 +81,7 @@
 
 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
@@ -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",

diff --git a/activerecord/test/cases/validations_i18n_test.rb b/activerecord/test/cases/validations_i18n_test.rb
diff --git a/activesupport/lib/active_support.rb b/activesupport/lib/active_support.rb
@@ -55,7 +55,10 @@
 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')

diff --git a/activesupport/lib/active_support/lang/en-US.rb b/activesupport/lib/active_support/lang/en-US.rb
@@ -1,4 +1,4 @@
-I18n.backend.set_translations :'en-US', {
+I18n.backend.store_translations :'en-US', {
   :support => {
     :array => {
       :sentence_connector => 'and'

diff --git a/activesupport/lib/active_support/vendor/i18n-0.0.1 b/activesupport/lib/active_support/vendor/i18n-0.0.1