Removed dead code from SingletonMethods

jodosha · Jun 12, 2008 · bc38c1a · bc38c1a
1 parent 3326da3
commit bc38c1a
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 71 deletions.
diff --git a/lib/click_to_globalize.rb b/lib/click_to_globalize.rb
@@ -221,38 +221,6 @@ module SingletonMethods
       def globalize?
         true
       end
-
-      # Sets the current formatting style.
-      #
-      # The options available are:
-      #   * textile (RedCloth gem)
-      #   * markdown (BlueCloth gem)
-      #
-      # Example:
-      #
-      #   class ApplicationController < ActionController::Base
-      #     self.formatting :textile
-      #   end
-      def formatting(formatting)
-        Locale.formatting = formatting
-      end
-
-      def languages #:nodoc:
-        @@languages ||= {Locale.active.language.to_s.downcase.to_sym =>  Locale.active.code}
-      end
-
-      # Set the application languages.
-      #
-      # Example:
-      #
-      #   class ApplicationController < ActionController::Base
-      #     self.languages = { :english => 'en-US, :italian => 'it-IT' }
-      #   end
-      def languages=(languages_hash)
-        base_language = Locale.active.language.nil? ? {} : { Locale.active.language.to_s.downcase.to_sym => Locale.active.code }
-        @@languages = languages_hash.merge(base_language) unless languages_hash.nil?
-        @@languages
-      end
     end
   end
 end

diff --git a/test/click_to_globalize_test.rb b/test/click_to_globalize_test.rb
@@ -271,7 +271,7 @@ def ignore_test_helper_in_place_globalizer
   end
 
   def test_helper_languages
-    ApplicationController.languages = @languages
+    Locale.all = @languages
     assert_equal(@languages, languages)
   end
 
@@ -287,45 +287,7 @@ def test_controller_deprecated_globalize
   def test_controller_globalize
     assert @controller.globalize?
   end
-
-  def test_languages_set
-    assert_not_nil(ApplicationController.languages)
-    ApplicationController.languages = nil
-    assert_equal(@languages, ApplicationController.languages)
 
-    ApplicationController.languages = @languages
-    assert_not_nil(ApplicationController.languages)
-    assert_kind_of(Hash, ApplicationController.languages)
-    assert_equal(@languages, ApplicationController.languages)
-
-    ApplicationController.languages = @new_languages
-    assert_not_nil(ApplicationController.languages)
-    assert_kind_of(Hash, ApplicationController.languages)
-    assert_equal(@new_languages.merge(@base_language), ApplicationController.languages)
-
-    ApplicationController.languages = @languages # re-assign
-    assert_equal(@languages, ApplicationController.languages)
-
-    ApplicationController.languages = @new_languages
-    assert_equal(@new_languages.merge(@base_language), ApplicationController.languages)
-  end
-
-  def test_languages
-    ApplicationController.languages = @languages
-    languages = ApplicationController.languages
-    assert_not_nil(languages)
-    assert_kind_of(Hash, languages)
-    assert_equal(@languages, languages)
-    languages.each do |language, locale|
-      assert_not_nil(language)
-      assert_kind_of(Symbol, language)
-      assert_equal(@languages[language], languages[language])
-
-      assert_not_nil(locale)
-      assert_kind_of(String, locale)
-    end
-  end
-
   def test_controller_observe_locale
     get :index, {:key => @hello_world.tr_key, :language_id => 1, :locale => @default_locale.code}
     assert_response :success