Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Merge pull request #409 from nhocki/patch-1

Make CanCan Default Message a translatable text.
  • Loading branch information...
commit 8f815c422ac8d4b592a18bdebf7b3b5813535e73 2 parents 613ab1c + 1c3e617
@ryanb authored
Showing with 24 additions and 1 deletion.
  1. +1 −1  lib/cancan/exceptions.rb
  2. +23 −0 spec/cancan/exceptions_spec.rb
View
2  lib/cancan/exceptions.rb
@@ -40,7 +40,7 @@ def initialize(message = nil, action = nil, subject = nil)
@message = message
@action = action
@subject = subject
- @default_message = "You are not authorized to access this page."
+ @default_message = I18n.t(:"unauthorized.default", :default => "You are not authorized to access this page.")
end
def to_s
View
23 spec/cancan/exceptions_spec.rb
@@ -32,4 +32,27 @@
@exception.message.should == "Access denied!"
end
end
+
+ describe "i18n in the default message" do
+ after(:each) do
+ I18n.backend = nil
+ end
+
+ it "uses i18n for the default message" do
+ I18n.backend.store_translations :en, :unauthorized => {:default => "This is a different message"}
+ @exception = CanCan::AccessDenied.new
+ @exception.message.should == "This is a different message"
+ end
+
+ it "defaults to a nice message" do
+ @exception = CanCan::AccessDenied.new
+ @exception.message.should == "You are not authorized to access this page."
+ end
+
+ it "does not use translation if a message is given" do
+ @exception = CanCan::AccessDenied.new("Hey! You're not welcome here")
+ @exception.message.should == "Hey! You're not welcome here"
+ @exception.message.should_not == "You are not authorized to access this page."
+ end
+ end
end
Please sign in to comment.
Something went wrong with that request. Please try again.