summaryrefslogtreecommitdiff
path: root/users/config
diff options
context:
space:
mode:
authorjessib <jessib@leap.se>2013-07-11 11:14:43 -0700
committerjessib <jessib@leap.se>2013-07-11 11:14:43 -0700
commitcc83a756affe1cedd6d828f038632b36e8afe95c (patch)
treebf6d9255ee9709d1504832a61c8918e7ac5cc9bb /users/config
parent09b7f01cac6df1ae11f4129b20b781b78a3706ac (diff)
parent02b69c78eed7682c24cb8361da094bdac45a7749 (diff)
Merge branch 'master' into feature/authentication_generic_error
Diffstat (limited to 'users/config')
-rw-r--r--users/config/locales/en.yml7
-rw-r--r--users/config/routes.rb2
2 files changed, 9 insertions, 0 deletions
diff --git a/users/config/locales/en.yml b/users/config/locales/en.yml
index b880887..1aa7005 100644
--- a/users/config/locales/en.yml
+++ b/users/config/locales/en.yml
@@ -30,6 +30,13 @@ en:
not_authorized: "Sorry, but you are not authorized to perform that action."
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."
+ enable_account: "Enable the account %{username}"
+ enable_description: "This will restore the account to full functionality"
+ deactivate_account: "Deactivate the account %{username}"
+ deactivate_description: "This will temporarily deactivate some account functionality." #todo detail exact functionality. can receive email but not send or renew client certificate?
+
#
# overview
diff --git a/users/config/routes.rb b/users/config/routes.rb
index b6d583e..4fa185f 100644
--- a/users/config/routes.rb
+++ b/users/config/routes.rb
@@ -17,6 +17,8 @@ Rails.application.routes.draw do
resource :overview, :only => [:show]
resource :email_settings, :only => [:edit, :update]
resources :email_aliases, :only => [:destroy], :id => /.*/
+ post 'deactivate', on: :member
+ post 'enable', on: :member
end
get "/.well-known/host-meta" => 'webfinger#host_meta'