From 131982c8e9b0ec847573231acd71ac188dd9f1b6 Mon Sep 17 00:00:00 2001 From: kikito Date: Wed, 7 Oct 2015 19:43:34 +0200 Subject: [PATCH] Moves translations from one namespace to another --- app/models/verification/management/email.rb | 4 ++-- config/locales/management.en.yml | 3 +++ config/locales/management.es.yml | 2 ++ 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/app/models/verification/management/email.rb b/app/models/verification/management/email.rb index 9863b05d6..5b7593673 100644 --- a/app/models/verification/management/email.rb +++ b/app/models/verification/management/email.rb @@ -45,10 +45,10 @@ class Verification::Management::Email return if errors.count > 0 errors.add(:email, I18n.t('errors.messages.user_not_found')) unless user? if already_verified? - errors.add(:email, I18n.t('management.users.already_verified')) + errors.add(:email, I18n.t('management.email_verifications.already_verified')) elsif document_number_mismatch? errors.add(:email, - I18n.t('management.users.document_mismatch', + I18n.t('management.email_verifications.document_mismatch', document_type: ApplicationController.helpers.humanize_document_type(user.document_type), document_number: user.document_number)) end diff --git a/config/locales/management.en.yml b/config/locales/management.en.yml index b63d1c648..d0084264b 100644 --- a/config/locales/management.en.yml +++ b/config/locales/management.en.yml @@ -18,6 +18,7 @@ en: support_proposals: "Support proposals" vote_proposals: "Vote proposals" document_verifications: + title: "User management" please_check_account_data: "Please check that the account data above are correct." already_verified: "This user account is already verified." in_census_has_following_permissions: "This user can participate in the website with the following permissions:" @@ -33,3 +34,5 @@ en: send_email: "Send verification email" email_sent_instructions: "In order to completely verify this user, it is necessary that the user clicks on a link which we have sent to the email address above. This step is needed in order to confirm that the address belongs to him." if_no_existing_account: "If this person has not created an account yet" + document_mismatch: "This email belongs to a user which already has an associated id: %{document_number}(%{document_type})" + already_verified: "This user account is already verified." diff --git a/config/locales/management.es.yml b/config/locales/management.es.yml index 92cb9a43c..68581a906 100644 --- a/config/locales/management.es.yml +++ b/config/locales/management.es.yml @@ -19,6 +19,7 @@ es: support_proposals: "Apoyar propuestas" vote_proposals: "Participar en las votaciones finales" document_verifications: + title: "Gestión de usuarios" please_check_account_data: "Compruebe que los datos anteriores son correctos para proceder a verificar la cuenta completamente." already_verified: "Esta cuenta de usuario ya está verificada." in_census_has_following_permissions: "Este usuario puede participar en el Portal de Gobierno Abierto del Ayuntamiento de Madrid con las siguientes posibilidades:" @@ -41,6 +42,7 @@ es: document_mismatch: "Ese email corresponde a un usuario que ya tiene asociado el documento %{document_number}(%{document_type})" + already_verified: "Esta cuenta de usuario ya está verificada." create_user: "Crear nueva cuenta de usuario" create_user_info: "Procedemos a crear un usuario con la siguiente información:" create_user_submit: "Crear usuario"