lib/authlogic/i18n.rb in authlogic-3.8.0 vs lib/authlogic/i18n.rb in authlogic-4.0.0
- old
+ new
@@ -34,20 +34,22 @@
# authlogic:
# error_messages:
# login_blank: can not be blank
# login_not_found: is not valid
# login_invalid: should use only letters, numbers, spaces, and .-_@+ please.
- # consecutive_failed_logins_limit_exceeded: Consecutive failed logins limit exceeded, account is disabled.
+ # consecutive_failed_logins_limit_exceeded: >
+ # Consecutive failed logins limit exceeded, account is disabled.
# email_invalid: should look like an email address.
# email_invalid_international: should look like an international email address.
# password_blank: can not be blank
# password_invalid: is not valid
# not_active: Your account is not active
# not_confirmed: Your account is not confirmed
# not_approved: Your account is not approved
# no_authentication_details: You did not provide any details for authentication.
# general_credentials_error: Login/Password combination is not valid
+ # session_invalid: Your session is invalid and has the following errors:
# models:
# user_session: UserSession (or whatever name you are using)
# attributes:
# user_session: (or whatever name you are using)
# login: login
@@ -81,10 +83,10 @@
# All message translation is passed to this method. The first argument is the key
# for the message. The second is options, see the rails I18n library for a list of
# options used.
def translate(key, options = {})
- translator.translate key, { :scope => I18n.scope }.merge(options)
+ translator.translate key, { scope: I18n.scope }.merge(options)
end
alias :t :translate
end
end
end