consul/nairobi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Moves translations from one namespace to another

Browse Source
This commit is contained in:
kikito
2015-10-07 19:43:34 +02:00
parent d5d5e683d1
commit 131982c8e9
3 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/models/verification/management/email.rb
View File

@@ -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

3
config/locales/management.en.yml
View File

@@ -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."

2
config/locales/management.es.yml
View File

@@ -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"