From 9c350b60e87a58e4fcf748fe3c9bc1baa5c04655 Mon Sep 17 00:00:00 2001 From: Evelyn Date: Sun, 20 Sep 2015 13:53:53 -0500 Subject: adding ability to disable/enable users by admin --- config/locales/en/users.en.yml | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'config/locales/en') diff --git a/config/locales/en/users.en.yml b/config/locales/en/users.en.yml index 89307dd..3cfaef6 100644 --- a/config/locales/en/users.en.yml +++ b/config/locales/en/users.en.yml @@ -55,6 +55,14 @@ en: tickets: "Create and check support tickets." email: "Modify email settings." account: "Destroy your account." + actions: + toggle_user: "Toggle User" + enable_user: "Enable User" + disable_user: "Disable User" + confirm_user_deactivation: "Are you sure you want to deactive user with username '%{username}'?" + confirm_user_activation: "Are you sure you want to activate user with username '%{username}'?" + user_disabled_message: "User with username '%{username}' has been disabled." + user_enabled_message: "User with username '%{username}' has been enabled." # # rails @@ -76,4 +84,3 @@ en: placeholders: user: email_forward: "my_other_email@domain.net" - -- cgit v1.2.3 From b9aae16edf42d8fed5bc4df15698a1eed1cc9e3d Mon Sep 17 00:00:00 2001 From: Evelyn Date: Sun, 20 Sep 2015 18:10:42 -0500 Subject: fixing translations --- config/locales/en/users.en.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'config/locales/en') diff --git a/config/locales/en/users.en.yml b/config/locales/en/users.en.yml index 3cfaef6..65014bb 100644 --- a/config/locales/en/users.en.yml +++ b/config/locales/en/users.en.yml @@ -56,7 +56,7 @@ en: email: "Modify email settings." account: "Destroy your account." actions: - toggle_user: "Toggle User" + toggle_user: "Enable / Disable User" enable_user: "Enable User" disable_user: "Disable User" confirm_user_deactivation: "Are you sure you want to deactive user with username '%{username}'?" -- cgit v1.2.3 From af140de5dd27b93b8cd58dd201fc4c0b1d5a23ec Mon Sep 17 00:00:00 2001 From: Evelyn Date: Mon, 21 Sep 2015 22:56:31 -0500 Subject: test users_controller_test --- config/locales/en/users.en.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'config/locales/en') diff --git a/config/locales/en/users.en.yml b/config/locales/en/users.en.yml index 65014bb..e2a880c 100644 --- a/config/locales/en/users.en.yml +++ b/config/locales/en/users.en.yml @@ -55,14 +55,14 @@ en: tickets: "Create and check support tickets." email: "Modify email settings." account: "Destroy your account." - actions: - toggle_user: "Enable / Disable User" - enable_user: "Enable User" - disable_user: "Disable User" - confirm_user_deactivation: "Are you sure you want to deactive user with username '%{username}'?" - confirm_user_activation: "Are you sure you want to activate user with username '%{username}'?" - user_disabled_message: "User with username '%{username}' has been disabled." - user_enabled_message: "User with username '%{username}' has been enabled." + actions: + toggle_user: "Enable / Disable User" + enable_user: "Enable User" + disable_user: "Disable User" + confirm_user_deactivation: "Are you sure you want to deactive user with username '%{username}'?" + confirm_user_activation: "Are you sure you want to activate user with username '%{username}'?" + user_disabled_message: "User with username '%{username}' has been disabled." + user_enabled_message: "User with username '%{username}' has been enabled." # # rails -- cgit v1.2.3