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 ++++++++- config/locales/es.yml | 8 ++++++++ 2 files changed, 16 insertions(+), 1 deletion(-) (limited to 'config') 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" - diff --git a/config/locales/es.yml b/config/locales/es.yml index 2a36b6e..1081e91 100644 --- a/config/locales/es.yml +++ b/config/locales/es.yml @@ -110,6 +110,14 @@ es: user: one: Usuario other: '%{count} usuarios' + 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." create_new_customer: Crear un nuevo Cliente de Braintree must_create_customer: Tiene que almacenar un cliente en Braintree antes de suscribirse a un plan subscribe: Suscribirse -- cgit v1.2.3 From b40efee0bd29c16c1e50f2672feea612262fd459 Mon Sep 17 00:00:00 2001 From: Evelyn Date: Sun, 20 Sep 2015 18:09:00 -0500 Subject: spanish translations for user actions --- config/locales/es.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'config') diff --git a/config/locales/es.yml b/config/locales/es.yml index 1081e91..6247eed 100644 --- a/config/locales/es.yml +++ b/config/locales/es.yml @@ -114,10 +114,10 @@ es: 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." + confirm_user_deactivation: "Estás seguro que quieres desactivar user con username '%{username}'?" + confirm_user_activation: "Estás seguro que quieres activar user con username '%{username}'?" + user_disabled_message: "User con username '%{username}' ha sido desactivado." + user_enabled_message: "User with username '%{username}' ha sido activado." create_new_customer: Crear un nuevo Cliente de Braintree must_create_customer: Tiene que almacenar un cliente en Braintree antes de suscribirse a un plan subscribe: Suscribirse -- 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 +- config/locales/es.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'config') 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}'?" diff --git a/config/locales/es.yml b/config/locales/es.yml index 6247eed..dbe416a 100644 --- a/config/locales/es.yml +++ b/config/locales/es.yml @@ -111,7 +111,7 @@ es: one: Usuario other: '%{count} usuarios' actions: - toggle_user: "Toggle User" + toggle_user: "Enable / Disable User" enable_user: "Enable User" disable_user: "Disable User" confirm_user_deactivation: "Estás seguro que quieres desactivar user con 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') 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 From d612b1a64aecec0c00557d43ac08d9b93121aa61 Mon Sep 17 00:00:00 2001 From: EvyW Date: Mon, 28 Sep 2015 10:52:27 -0500 Subject: Translation changes From line 114 to line 120 --- config/locales/es.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'config') diff --git a/config/locales/es.yml b/config/locales/es.yml index dbe416a..f745257 100644 --- a/config/locales/es.yml +++ b/config/locales/es.yml @@ -111,13 +111,13 @@ es: one: Usuario other: '%{count} usuarios' actions: - toggle_user: "Enable / Disable User" - enable_user: "Enable User" - disable_user: "Disable User" - confirm_user_deactivation: "Estás seguro que quieres desactivar user con username '%{username}'?" - confirm_user_activation: "Estás seguro que quieres activar user con username '%{username}'?" - user_disabled_message: "User con username '%{username}' ha sido desactivado." - user_enabled_message: "User with username '%{username}' ha sido activado." + toggle_user: "Activar / Desactivar Usuario" + enable_user: "Activar Usuario" + disable_user: "Desactivar Usuario" + confirm_user_deactivation: "Estás seguro que quieres desactivar al usuario con nombre '%{username}'?" + confirm_user_activation: "Estás seguro que quieres activar al usuario con nombre '%{username}'?" + user_disabled_message: "Usuario con nombre '%{username}' ha sido desactivado." + user_enabled_message: "Usuario con nombre '%{username}' ha sido activado." create_new_customer: Crear un nuevo Cliente de Braintree must_create_customer: Tiene que almacenar un cliente en Braintree antes de suscribirse a un plan subscribe: Suscribirse -- cgit v1.2.3