Merge pull request #409 from nhocki/patch-1
Make CanCan Default Message a translatable text.
This commit is contained in:
commit
8f815c422a
|
@ -40,7 +40,7 @@ module CanCan
|
||||||
@message = message
|
@message = message
|
||||||
@action = action
|
@action = action
|
||||||
@subject = subject
|
@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
|
end
|
||||||
|
|
||||||
def to_s
|
def to_s
|
||||||
|
|
|
@ -32,4 +32,27 @@ describe CanCan::AccessDenied do
|
||||||
@exception.message.should == "Access denied!"
|
@exception.message.should == "Access denied!"
|
||||||
end
|
end
|
||||||
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
|
end
|
||||||
|
|
Loading…
Reference in New Issue
Block a user