From 92b1e53fc3b8295e43beeef341d88f03d8de0e38 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javi=20Mart=C3=ADn?= Date: Thu, 5 May 2022 16:11:26 +0200 Subject: [PATCH] Unify user permission texts We had the same texts four times, with slight variations in the case of the management section. We're unifying them under the "verification" i18n namespace, since the texts are about actions which can be done depending on whether users are verified or not. Note the names of the i18n keys aren't very consistent, since we use "debates" in plural but "proposal" in singular. We're leaving it like this so existing translations aren't affected. --- app/views/account/show.html.erb | 8 ++++---- app/views/management/_user_permissions.html.erb | 4 ++-- .../document_verifications/invalid_document.html.erb | 2 +- app/views/management/document_verifications/new.html.erb | 2 +- .../management/document_verifications/verified.html.erb | 2 +- app/views/management/email_verifications/sent.html.erb | 2 +- app/views/management/users/new.html.erb | 2 +- app/views/management/users/show.html.erb | 2 +- config/locales/en/general.yml | 8 -------- config/locales/en/management.yml | 5 ----- config/locales/es/general.yml | 8 -------- config/locales/es/management.yml | 5 ----- db/pages/welcome_level_three_verified.rb | 8 ++++---- db/pages/welcome_level_two_verified.rb | 8 ++++---- db/pages/welcome_not_verified.rb | 8 ++++---- spec/system/management/document_verifications_spec.rb | 2 +- spec/system/management/managed_users_spec.rb | 2 +- 17 files changed, 26 insertions(+), 52 deletions(-) diff --git a/app/views/account/show.html.erb b/app/views/account/show.html.erb index 1a1d4dbea..22a1462cd 100644 --- a/app/views/account/show.html.erb +++ b/app/views/account/show.html.erb @@ -94,15 +94,15 @@

<%= t("account.show.user_permission_info") %>

diff --git a/app/views/management/_user_permissions.html.erb b/app/views/management/_user_permissions.html.erb index f083cd322..37556f138 100644 --- a/app/views/management/_user_permissions.html.erb +++ b/app/views/management/_user_permissions.html.erb @@ -7,10 +7,10 @@

<%= message %>

diff --git a/app/views/management/document_verifications/invalid_document.html.erb b/app/views/management/document_verifications/invalid_document.html.erb index 936e946c6..8de89d6f9 100644 --- a/app/views/management/document_verifications/invalid_document.html.erb +++ b/app/views/management/document_verifications/invalid_document.html.erb @@ -8,7 +8,7 @@ <%= render "management/user_permissions", message: t("management.document_verifications.not_in_census_info"), - permissions: [:debates, :create_proposals] %> + permissions: [:debates, :proposal] %>

<%= sanitize(t("management.document_verifications.has_no_account", diff --git a/app/views/management/document_verifications/new.html.erb b/app/views/management/document_verifications/new.html.erb index 230e94459..a816520c5 100644 --- a/app/views/management/document_verifications/new.html.erb +++ b/app/views/management/document_verifications/new.html.erb @@ -4,7 +4,7 @@ <%= render "management/user_permissions", message: t("management.document_verifications.in_census_has_following_permissions"), - permissions: [:debates, :create_proposals, :support_proposals] %> + permissions: [:debates, :proposal, :support_proposal] %> <%= form_for @document_verification, as: :document_verification, diff --git a/app/views/management/document_verifications/verified.html.erb b/app/views/management/document_verifications/verified.html.erb index c491e15c8..b20af33d3 100644 --- a/app/views/management/document_verifications/verified.html.erb +++ b/app/views/management/document_verifications/verified.html.erb @@ -4,6 +4,6 @@ <%= render "management/user_permissions", message: t("management.document_verifications.in_census_has_following_permissions"), - permissions: [:debates, :create_proposals, :support_proposals, :vote_proposals] %> + permissions: [:debates, :proposal, :support_proposal, :votes] %> <%= t("management.print_info") %> diff --git a/app/views/management/email_verifications/sent.html.erb b/app/views/management/email_verifications/sent.html.erb index a996ead96..9eae46bff 100644 --- a/app/views/management/email_verifications/sent.html.erb +++ b/app/views/management/email_verifications/sent.html.erb @@ -4,7 +4,7 @@ <%= render "management/user_permissions", message: t("management.email_verifications.document_found_in_census"), - permissions: [:debates, :create_proposals, :support_proposals, :vote_proposals] %> + permissions: [:debates, :proposal, :support_proposal, :votes] %>

<%= t("management.print_info") %> diff --git a/app/views/management/users/new.html.erb b/app/views/management/users/new.html.erb index cc62812be..632ce1cf7 100644 --- a/app/views/management/users/new.html.erb +++ b/app/views/management/users/new.html.erb @@ -25,6 +25,6 @@

<%= render "management/user_permissions", message: t("management.document_verifications.in_census_has_following_permissions"), - permissions: [:debates, :create_proposals, :support_proposals, :vote_proposals] %> + permissions: [:debates, :proposal, :support_proposal, :votes] %>
diff --git a/app/views/management/users/show.html.erb b/app/views/management/users/show.html.erb index ea7f758b4..89bf3bba5 100644 --- a/app/views/management/users/show.html.erb +++ b/app/views/management/users/show.html.erb @@ -6,6 +6,6 @@ <%= render "management/user_permissions", message: t("management.document_verifications.in_census_has_following_permissions"), - permissions: [:debates, :create_proposals, :support_proposals, :vote_proposals] %> + permissions: [:debates, :proposal, :support_proposal, :votes] %> <%= t("management.print_info") %> diff --git a/config/locales/en/general.yml b/config/locales/en/general.yml index 5065bac6c..20c977dc7 100644 --- a/config/locales/en/general.yml +++ b/config/locales/en/general.yml @@ -11,13 +11,9 @@ en: save_changes_submit: Save changes recommendations: Recommendations title: My account - user_permission_debates: Participate in debates user_permission_info: With your account you can... - user_permission_proposal: Create new proposals - user_permission_support_proposal: Support proposals user_permission_title: Participation user_permission_verify: To perform all the actions verify your account. - user_permission_votes: Participate in final voting verified_account: Account verified verify_my_account: Verify my account application: @@ -892,13 +888,9 @@ en: go_to_index: Not now, go to index page start_using_consul: Go to index page title: Participate - user_permission_debates: Participate in debates user_permission_info: With your account you can... - user_permission_proposal: Create new proposals - user_permission_support_proposal: Support proposals user_permission_verify: "To perform the following actions verify your account." user_permission_verify_my_account: Verify my account - user_permission_votes: Participate in final voting invisible_captcha: sentence_for_humans: "If you are human, ignore this field" timestamp_error_message: "Sorry, that was too quick! Please resubmit." diff --git a/config/locales/en/management.yml b/config/locales/en/management.yml index a66790849..85ad93a64 100644 --- a/config/locales/en/management.yml +++ b/config/locales/en/management.yml @@ -64,11 +64,6 @@ en: users: Users management user_invites: Send invitations select_user: Select user - permissions: - create_proposals: Create proposals - debates: Engage in debates - support_proposals: Support proposals - vote_proposals: Vote proposals print: proposals_info: Create your proposal on http://url.consul proposals_title: "Proposals:" diff --git a/config/locales/es/general.yml b/config/locales/es/general.yml index fc4bfdfc8..8dc487a97 100644 --- a/config/locales/es/general.yml +++ b/config/locales/es/general.yml @@ -11,13 +11,9 @@ es: save_changes_submit: Guardar cambios recommendations: Recomendaciones title: Mi cuenta - user_permission_debates: Participar en debates user_permission_info: Con tu cuenta ya puedes... - user_permission_proposal: Crear nuevas propuestas - user_permission_support_proposal: Apoyar propuestas user_permission_title: Participación user_permission_verify: Para poder realizar todas las acciones, verifica tu cuenta. - user_permission_votes: Participar en las votaciones finales verified_account: Cuenta verificada verify_my_account: Verificar mi cuenta application: @@ -892,13 +888,9 @@ es: go_to_index: Ahora no, ir a la página de inicio start_using_consul: Ir a la página de inicio title: Empieza a participar - user_permission_debates: Participar en debates user_permission_info: Con tu cuenta ya puedes... - user_permission_proposal: Crear nuevas propuestas - user_permission_support_proposal: Apoyar propuestas user_permission_verify: "Para poder realizar las siguientes acciones, verifica tu cuenta." user_permission_verify_my_account: Verificar mi cuenta - user_permission_votes: Participar en las votaciones finales invisible_captcha: sentence_for_humans: "Si eres humano, por favor ignora este campo" timestamp_error_message: "Eso ha sido demasiado rápido. Por favor, reenvía el formulario." diff --git a/config/locales/es/management.yml b/config/locales/es/management.yml index e0e018d90..3740fc3da 100644 --- a/config/locales/es/management.yml +++ b/config/locales/es/management.yml @@ -64,11 +64,6 @@ es: users: Gestión de usuarios user_invites: Enviar invitaciones select_user: Seleccionar usuario - permissions: - create_proposals: Crear nuevas propuestas - debates: Participar en debates - support_proposals: Apoyar propuestas - vote_proposals: Participar en las votaciones finales print: proposals_info: Haz tu propuesta en http://url.consul proposals_title: "Propuestas:" diff --git a/db/pages/welcome_level_three_verified.rb b/db/pages/welcome_level_three_verified.rb index e0805862a..5467f5917 100644 --- a/db/pages/welcome_level_three_verified.rb +++ b/db/pages/welcome_level_three_verified.rb @@ -3,10 +3,10 @@ def generate_content(page) page.content = "

#{I18n.t("welcome.welcome.user_permission_info")}

#{I18n.t("account.show.verified_account")}

diff --git a/db/pages/welcome_level_two_verified.rb b/db/pages/welcome_level_two_verified.rb index bf9e1376f..251fc6b04 100644 --- a/db/pages/welcome_level_two_verified.rb +++ b/db/pages/welcome_level_two_verified.rb @@ -3,14 +3,14 @@ def generate_content(page) page.content = "

#{I18n.t("welcome.welcome.user_permission_info")}

#{I18n.t("welcome.welcome.user_permission_verify")}

diff --git a/db/pages/welcome_not_verified.rb b/db/pages/welcome_not_verified.rb index a0d66fe68..4263130f0 100644 --- a/db/pages/welcome_not_verified.rb +++ b/db/pages/welcome_not_verified.rb @@ -3,14 +3,14 @@ def generate_content(page) page.content = "

#{I18n.t("welcome.welcome.user_permission_info")}

#{I18n.t("welcome.welcome.user_permission_verify")}

 diff --git a/spec/system/management/document_verifications_spec.rb b/spec/system/management/document_verifications_spec.rb index 2396fac54..17080e85d 100644 --- a/spec/system/management/document_verifications_spec.rb +++ b/spec/system/management/document_verifications_spec.rb @@ -20,7 +20,7 @@ describe "DocumentVerifications" do fill_in "document_verification_document_number", with: user.document_number click_button "Check document" - expect(page).to have_content "Vote proposals" + expect(page).to have_content "Participate in final voting" click_button "Verify" diff --git a/spec/system/management/managed_users_spec.rb b/spec/system/management/managed_users_spec.rb index 2dc605ac0..2d12fa53b 100644 --- a/spec/system/management/managed_users_spec.rb +++ b/spec/system/management/managed_users_spec.rb @@ -34,7 +34,7 @@ describe "Managed User" do fill_in "document_verification_document_number", with: user.document_number click_button "Check document" - expect(page).to have_content "Vote proposals" + expect(page).to have_content "Participate in final voting" click_button "Verify"