Proper API for reloading translations

5 files changed, 16 insertions, 4 deletions

diff --git a/actionpack/lib/action_controller/dispatcher.rb b/actionpack/lib/action_controller/dispatcher.rb
index 28f8ce3d53..f3e173004a 100644
--- a/actionpack/lib/action_controller/dispatcher.rb
+++ b/actionpack/lib/action_controller/dispatcher.rb
@@ -28,6 +28,10 @@ module ActionController
         end
 
         after_dispatch :flush_logger if Base.logger && Base.logger.respond_to?(:flush)
+
+        to_prepare do
+          I18n.reload!
+        end
       end
 
       # Backward-compatible class method takes CGI-specific args. Deprecated
diff --git a/actionpack/test/template/translation_helper_test.rb b/actionpack/test/template/translation_helper_test.rb
index 7b94221ec0..1b28a59288 100644
--- a/actionpack/test/template/translation_helper_test.rb
+++ b/actionpack/test/template/translation_helper_test.rb
@@ -10,8 +10,8 @@ class TranslationHelperTest < Test::Unit::TestCase
     end
     
     def test_delegates_to_i18n_setting_the_raise_option
-      I18n.expects(:translate).with(:foo, 'en-US', :raise => true)
-      translate :foo, 'en-US'
+      I18n.expects(:translate).with(:foo, :locale => 'en-US', :raise => true)
+      translate :foo, :locale => 'en-US'
     end
     
     def test_returns_missing_translation_message_wrapped_into_span
diff --git a/activesupport/CHANGELOG b/activesupport/CHANGELOG
index 903c7b6e76..24a7f1639e 100644
--- a/activesupport/CHANGELOG
+++ b/activesupport/CHANGELOG
@@ -1,6 +1,6 @@
 *2.2.1 [RC2 or 2.2 final]*
 
-* Make I18n::Backend::Simple reload its translations in development mode [DHH]
+* Make I18n::Backend::Simple reload its translations in development mode [DHH/Sven Fuchs]
 
 
 *2.2.0 [RC1] (October 24th, 2008)*
diff --git a/activesupport/lib/active_support/vendor/i18n-0.0.1/i18n.rb b/activesupport/lib/active_support/vendor/i18n-0.0.1/i18n.rb
index 9b0b69f58b..40e82d8225 100755
--- a/activesupport/lib/active_support/vendor/i18n-0.0.1/i18n.rb
+++ b/activesupport/lib/active_support/vendor/i18n-0.0.1/i18n.rb
@@ -67,6 +67,13 @@ module I18n
     def load_path=(load_path)
       @@load_path = load_path
     end
+
+    # Tells the backend to reload translations. Used in situations like the
+    # Rails development environment. Backends can implement whatever strategy
+    # is useful.
+    def reload!
+      backend.reload!
+    end
     
     # Translates, pluralizes and interpolates a given key using a given locale, 
     # scope, and default, as well as interpolation values.
diff --git a/activesupport/lib/active_support/vendor/i18n-0.0.1/i18n/backend/simple.rb b/activesupport/lib/active_support/vendor/i18n-0.0.1/i18n/backend/simple.rb
index c682eadf85..bdda55d3fe 100644
--- a/activesupport/lib/active_support/vendor/i18n-0.0.1/i18n/backend/simple.rb
+++ b/activesupport/lib/active_support/vendor/i18n-0.0.1/i18n/backend/simple.rb
@@ -69,8 +69,9 @@ module I18n
         @initialized ||= false
       end
 
-      def reload
+      def reload!
         @initialized = false
+        @translations = nil
       end
 
       protected