diff options
| author | Azul <azul@leap.se> | 2013-08-21 20:37:23 +0200 |
|---|---|---|
| committer | Azul <azul@leap.se> | 2013-08-21 20:37:23 +0200 |
| commit | 41de2179c67fc09e1558280c5601cc07b2e40b43 (patch) | |
| tree | 9e9a54ca6f063ecbe121926c8f8a16f9b3bfcff4 /users | |
| parent | e325de14dd0d9878a3392051dc98a14d9811d2c9 (diff) | |
| parent | c073099f0283492b30e702d833721206ab9986cc (diff) | |
Merge remote-tracking branch 'jessib/js_warning'
Diffstat (limited to 'users')
| -rw-r--r-- | users/app/views/users/_warnings.html.haml | 2 | ||||
| -rw-r--r-- | users/config/locales/en.yml | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/users/app/views/users/_warnings.html.haml b/users/app/views/users/_warnings.html.haml index 7e0b2ce..79ab103 100644 --- a/users/app/views/users/_warnings.html.haml +++ b/users/app/views/users/_warnings.html.haml @@ -1,5 +1,5 @@ %noscript - %div.alert.alert-error=t :js_required + %div.alert.alert-error=t :js_required_html #cookie_warning.alert.alert-error{:style => "display:none"} =t :cookie_disabled_warning :javascript diff --git a/users/config/locales/en.yml b/users/config/locales/en.yml index 62f822c..55ba3a1 100644 --- a/users/config/locales/en.yml +++ b/users/config/locales/en.yml @@ -32,7 +32,7 @@ en: not_authorized_login: "Please log in to perform that action." search: "Search" cookie_disabled_warning: "You have cookies disabled. You will not be able to login until you enable cookies." - js_required: "We are sorry, but this doesn't work without javascript enabled. This is for security reasons." + js_required_html: "We are sorry, but this doesn't work without javascript enabled. This is because the authentication system used, <a href='http://srp.stanford.edu/'>SRP</a>, requires javascript." enable_account: "Enable the account %{username}" enable_description: "This will restore the account to full functionality" deactivate_account: "Deactivate the account %{username}" |