Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/diaspora/diaspora.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authorAkash Agrawall <akash.wanted@gmail.com>2015-02-18 23:29:27 +0300
committerAkash Agrawall <akash.wanted@gmail.com>2015-02-19 03:15:04 +0300
commit3bb5e78893216fd940cd50307271eb235040aae5 (patch)
tree8e46bf8d4a970b7ac8a9ca79af95f3a67863cc5d /config
parentb4ab31d6f9415673911114044e41c690bae20e02 (diff)
Lock account #5564
Diffstat (limited to 'config')
-rw-r--r--config/locales/diaspora/en.yml5
-rw-r--r--config/routes.rb2
2 files changed, 7 insertions, 0 deletions
diff --git a/config/locales/diaspora/en.yml b/config/locales/diaspora/en.yml
index 720a0aa19..042354872 100644
--- a/config/locales/diaspora/en.yml
+++ b/config/locales/diaspora/en.yml
@@ -115,7 +115,12 @@ en:
add_invites: "Add invites"
close_account: "Close account"
are_you_sure: "Are you sure you want to close this account?"
+ are_you_sure_lock_account: "Are you sure you want to lock this account?"
+ are_you_sure_unlock_account: "Are you sure you want to unlock this account?"
account_closing_scheduled: "The account of %{name} is scheduled to be closed. It will be processed in a few moments..."
+ account_locking_scheduled: "The account of %{name} is scheduled to be locked. It will be processed in a few moments..."
+ account_unlocking_scheduled: "The account of %{name} is scheduled to be unlocked. It will be processed in a few moments..."
+ email_to: "Email to Invite"
email_to: "Email to invite"
under_13: "Show users that are under 13 (COPPA)"
users:
diff --git a/config/routes.rb b/config/routes.rb
index 8aa59a909..8eed61639 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -143,6 +143,8 @@ Diaspora::Application.routes.draw do
namespace :admin do
post 'users/:id/close_account' => 'users#close_account', :as => 'close_account'
+ post 'users/:id/lock_account' => 'users#lock_account', :as => 'lock_account'
+ post 'users/:id/unlock_account' => 'users#unlock_account', :as => 'unlock_account'
end
resource :profile, :only => [:edit, :update]