@@ -3,7 +3,7 @@ module ClickToGlobalizeHelper # Render +app/views/shared/_click_to_globalize.html.erb+. def click_to_globalize - render :file => @@click_partial if globalize? + render :file => @@click_partial if in_place_translations? end # Get form_authenticity_token if the application is protected from forgery. app/helpers/click_to_globalize_helper.rb @@ -78,20 +78,37 @@ module Click def self.included(recipient) recipient.send :include, InstanceMethods recipient.class_eval do - helper_method :globalize? + helper_method :in_place_translations? end end module InstanceMethods + include ActiveSupport::Deprecation + + # This is the <b>on/off</b> switch for the Click to Globalize features. + # Override this method in your controllers for custom conditions. + # + # Example: + # + # def in_place_translations? + # current_user.admin? + # end + def in_place_translations? + true + end + # This is the <b>on/off</b> switch for the Click to Globalize features. # Override this method in your controllers for custom conditions. # + # NOTICE: this method has been deprecated in favor of <tt>in_place_translations?</tt> + # # Example: # # def globalize? # current_user.admin? # end def globalize? + ::ActiveSupport::Deprecation.warn("You should use in_place_translations?", caller) true end end lib/click_to_globalize.rb @@ -8,7 +8,7 @@ end class TranslationsControllerTest < ActionController::TestCase test "should have translation mode enabled by default" do - assert @controller.globalize? + assert @controller.in_place_translations? end test "routing" do @@ -50,7 +50,11 @@ class AnApplicationControllerTest < ActionController::TestCase setup :load_translations test "should have translation mode enabled by default" do - assert @controller.globalize? + assert @controller.in_place_translations? + end + + test "globalize? deprecation" do + assert_deprecated("You should use in_place_translations?"){ @controller.globalize? } end test "should return translated contents" do @@ -63,7 +67,7 @@ class AnApplicationControllerTest < ActionController::TestCase end test "should always render the action" do - @controller.stubs(:globalize?).returns false + @controller.stubs(:in_place_translations?).returns false get :index, params assert_response :success test/functional/translations_controller_test.rb @@ -29,7 +29,7 @@ class ActionView::TestCase ActionView::Base.new.render options, extra_options, &block end - def globalize? - ApplicationController.new.globalize? + def in_place_translations? + ApplicationController.new.in_place_translations? end end test/test_helper.rb af269d1ac387d9c903eb18a821a90ec1dce53480 Luca Guidi guidi.luca@gmail.com http://github.com/jodosha/click-to-globalize/commit/13b12711754b829867df55b8ecf7ecc8398d7118 13b12711754b829867df55b8ecf7ecc8398d7118 2009-04-06T07:09:05-07:00 2009-04-06T07:09:05-07:00 Deprecated globalize? in favor of in_place_translations? 5b4d6413f942050e0b1c274d35f933c9805562e0 Luca Guidi guidi.luca@gmail.com