Merge pull request binarylogic#204 from benmanns/rails3-i18n.

Rails3 i18n
roverway · Apr 30, 2011 · 006f25a · 006f25a
2 parents cfd65d6 + 77532c4
commit 006f25a
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 0 deletions.
diff --git a/lib/authlogic/session/active_record_trickery.rb b/lib/authlogic/session/active_record_trickery.rb
@@ -46,6 +46,14 @@ def model_name
             ::ActiveSupport::ModelName.new(self.to_s)
           end
         end
+
+        def i18n_scope
+          I18n.scope
+        end
+
+        def lookup_ancestors
+          ancestors.select { |x| x.respond_to?(:model_name) }
+        end
       end
 
       module InstanceMethods

diff --git a/test/session_test/active_record_trickery_test.rb b/test/session_test/active_record_trickery_test.rb
@@ -19,6 +19,16 @@ def test_self_and_descendents_from_active_record
       def test_self_and_descendants_from_active_record
         assert_equal [UserSession], UserSession.self_and_descendants_from_active_record
       end
+
+      def test_i18n_of_human_name
+        I18n.backend.store_translations 'en', :authlogic => {:models => {:user_session => "MySession" } }
+        assert_equal "MySession", UserSession.human_name
+      end
+
+      def test_i18n_of_model_name_human
+        I18n.backend.store_translations 'en', :authlogic => {:models => {:user_session => "MySession" } }
+        assert_equal "MySession", UserSession.model_name.human
+      end
     end
 
     class InstanceMethodsTest < ActiveSupport::TestCase