@@ -203,12 +203,15 @@ module Globalize # :nodoc: # request is processed. # <tt>LocaleObserver</tt> catches all translations and pass them to the session. def observe_locales - return unless globalize? - locale_observer = LocaleObserver.new - Locale.add_observer(locale_observer) - yield - Locale.remove_observer(locale_observer) - session[:__globalize_translations] = format_translations(locale_observer) + unless globalize? + yield + else + locale_observer = LocaleObserver.new + Locale.add_observer(locale_observer) + yield + Locale.remove_observer(locale_observer) + session[:__globalize_translations] = format_translations(locale_observer) + end end # Fetch the translations from the given LocaleObserver. lib/click_to_globalize.rb @@ -232,6 +232,16 @@ class ClickToGlobalizeTest < Test::Unit::TestCase end end + uses_mocha 'ClickToGlobalizeAroundFilterTest' do + def test_should_always_yield_action_even_if_globalize_returns_false + @controller.expects(:globalize?).returns false + + get :index, params + assert_response :success + assert_nil translations + end + end + uses_mocha 'ClickToGlobalizeFormattingTest' do def test_should_return_plain_translations Locale.stubs(:formatting).returns nil test/click_to_globalize_test.rb 1c2f76259bce4ec7662767e8c59a4684c92887d9 Luca Guidi guidi.luca@gmail.com http://github.com/jodosha/click-to-globalize/commit/e19f1c8aa9eb176afe6cbc3c14a02e8c001749c7 e19f1c8aa9eb176afe6cbc3c14a02e8c001749c7 2008-08-05T02:01:56-07:00 2008-08-05T02:01:56-07:00 Make sure observe_locales filter always yield the action even if #globalize? return false [#4 state:resolved] 853683c7bcfc2748e4de61dfbebe7cab599d53f1 Luca Guidi guidi.luca@gmail.com