Convert OpenID authentication to use OmniAuth

[rails.git] / config / locales / en.yml

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 88d42282cdc4244735a25b87b1c2689f7b86c57c..c58ee0db52cbf8ff3f4bb95c89df9cbfe1b160e1 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -699,7 +699,7 @@ en:
           wood: "Wood"
         office:
           accountant: "Accountant"
           wood: "Wood"
         office:
           accountant: "Accountant"

-          administrative: "Admininstration"
+          administrative: "Administration"

           architect: "Architect"
           company: "Company"
           employment_agency: "Employment Agency"
           architect: "Architect"
           company: "Company"
           employment_agency: "Employment Agency"


@@ -1689,8 +1689,6 @@ en:
       account not active: "Sorry, your account is not active yet.<br />Please use the link in the account confirmation email to activate your account, or <a href=\"%{reconfirm}\">request a new confirmation email</a>."
       account is suspended: Sorry, your account has been suspended due to suspicious activity.<br />Please contact the <a href="%{webmaster}">webmaster</a> if you wish to discuss this.
       auth failure: "Sorry, could not log in with those details."
       account not active: "Sorry, your account is not active yet.<br />Please use the link in the account confirmation email to activate your account, or <a href=\"%{reconfirm}\">request a new confirmation email</a>."
       account is suspended: Sorry, your account has been suspended due to suspicious activity.<br />Please contact the <a href="%{webmaster}">webmaster</a> if you wish to discuss this.
       auth failure: "Sorry, could not log in with those details."

-      openid missing provider: "Sorry, could not contact your OpenID provider"
-      openid invalid: "Sorry, your OpenID seems to be malformed"

       openid_logo_alt: "Log in with an OpenID"
       openid_providers:
         openid:
       openid_logo_alt: "Log in with an OpenID"
       openid_providers:
         openid:


@@ -1965,6 +1963,9 @@ en:
           This decision will be reviewed by an administrator shortly, or
           you may contact the %{webmaster} if you wish to discuss this.
         </p>
           This decision will be reviewed by an administrator shortly, or
           you may contact the %{webmaster} if you wish to discuss this.
         </p>

+    auth_failure:
+      connection_failed: Connection to authentication provider failed
+      invalid_credentials: Invalid authentication credentials

   user_role:
     filter:
       not_an_administrator: "Only administrators can perform user role management, and you are not an administrator."
   user_role:
     filter:
       not_an_administrator: "Only administrators can perform user role management, and you are not an administrator."