From 67e9c68662cf5b349bfdb249371614ecf4b21ce3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javi=20Mart=C3=ADn?= Date: Thu, 5 May 2022 15:39:18 +0200 Subject: [PATCH] Remove confusing permission info in "my account" We were saying that actions marked with an asterisk were only possible when users were verified. However, there were no actions marked with an asterisk; instead, we didn't show these actions to non-verified users. Besides, the concept of Census doesn't exist in many CONSUL installations, where verification is done through other means, so the text saying that only users on Census could do certain things wasn't correct in these cases. Due to that, we're removing the asterisk in the Spanish version as well. We're also removing the asterisk in the default welcome pages, since we're already saying which action can't be done until the account is verified. In the case of the residence verification page, we had asterisks but we didn't explain what the asterisk stood for, so we're also removing it. --- app/views/account/show.html.erb | 3 --- config/locales/en/general.yml | 4 +--- config/locales/en/verification.yml | 4 ++-- config/locales/es/general.yml | 10 ++++------ config/locales/es/verification.yml | 2 +- db/pages/welcome_level_three_verified.rb | 2 -- db/pages/welcome_level_two_verified.rb | 2 -- db/pages/welcome_not_verified.rb | 2 -- 8 files changed, 8 insertions(+), 21 deletions(-) diff --git a/app/views/account/show.html.erb b/app/views/account/show.html.erb index f4f2fe010..1a1d4dbea 100644 --- a/app/views/account/show.html.erb +++ b/app/views/account/show.html.erb @@ -114,9 +114,6 @@ -

- <%= t("account.show.user_permission_verify_info") %> -

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

diff --git a/config/locales/en/general.yml b/config/locales/en/general.yml index fb672e02f..5065bac6c 100644 --- a/config/locales/en/general.yml +++ b/config/locales/en/general.yml @@ -17,7 +17,6 @@ en: user_permission_support_proposal: Support proposals user_permission_title: Participation user_permission_verify: To perform all the actions verify your account. - user_permission_verify_info: "* Only for users on Census." user_permission_votes: Participate in final voting verified_account: Account verified verify_my_account: Verify my account @@ -896,9 +895,8 @@ en: 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_support_proposal: Support proposals user_permission_verify: "To perform the following actions verify your account." - user_permission_verify_info: "* Only for users on Census." user_permission_verify_my_account: Verify my account user_permission_votes: Participate in final voting invisible_captcha: diff --git a/config/locales/en/verification.yml b/config/locales/en/verification.yml index 818769a39..d760284ac 100644 --- a/config/locales/en/verification.yml +++ b/config/locales/en/verification.yml @@ -90,8 +90,8 @@ en: user_permission_debates: Participate in debates user_permission_info: Verifying your information you'll be able to... user_permission_proposal: Create new proposals - user_permission_support_proposal: Support proposals* - user_permission_votes: Participate in final voting* + user_permission_support_proposal: Support proposals + user_permission_votes: Participate in final voting verified_user: form: submit_button: Send code diff --git a/config/locales/es/general.yml b/config/locales/es/general.yml index a9cc36d3e..fc4bfdfc8 100644 --- a/config/locales/es/general.yml +++ b/config/locales/es/general.yml @@ -14,11 +14,10 @@ es: 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_support_proposal: Apoyar propuestas user_permission_title: Participación user_permission_verify: Para poder realizar todas las acciones, verifica tu cuenta. - user_permission_verify_info: "* Sólo usuarios empadronados." - user_permission_votes: Participar en las votaciones finales* + user_permission_votes: Participar en las votaciones finales verified_account: Cuenta verificada verify_my_account: Verificar mi cuenta application: @@ -896,11 +895,10 @@ es: 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_support_proposal: Apoyar propuestas user_permission_verify: "Para poder realizar las siguientes acciones, verifica tu cuenta." - user_permission_verify_info: "* Sólo usuarios empadronados." user_permission_verify_my_account: Verificar mi cuenta - user_permission_votes: Participar en las votaciones finales* + 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/verification.yml b/config/locales/es/verification.yml index c3191438b..dea171c38 100644 --- a/config/locales/es/verification.yml +++ b/config/locales/es/verification.yml @@ -91,7 +91,7 @@ es: user_permission_info: Al verificar tus datos podrás... user_permission_proposal: Crear nuevas propuestas user_permission_support_proposal: Apoyar propuestas - user_permission_votes: Participar en las votaciones finales* + user_permission_votes: Participar en las votaciones finales verified_user: form: submit_button: Enviar código diff --git a/db/pages/welcome_level_three_verified.rb b/db/pages/welcome_level_three_verified.rb index 3c32afb88..e0805862a 100644 --- a/db/pages/welcome_level_three_verified.rb +++ b/db/pages/welcome_level_three_verified.rb @@ -9,8 +9,6 @@ def generate_content(page)
  • #{I18n.t("welcome.welcome.user_permission_votes")}
    • -

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

    -

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

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

    " diff --git a/db/pages/welcome_level_two_verified.rb b/db/pages/welcome_level_two_verified.rb index daff9fc42..bf9e1376f 100644 --- a/db/pages/welcome_level_two_verified.rb +++ b/db/pages/welcome_level_two_verified.rb @@ -13,8 +13,6 @@ def generate_content(page)
  • #{I18n.t("welcome.welcome.user_permission_votes")}
    • -

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

    - #{I18n.t("welcome.welcome.user_permission_verify_my_account")} diff --git a/db/pages/welcome_not_verified.rb b/db/pages/welcome_not_verified.rb index 1922c1e80..a0d66fe68 100644 --- a/db/pages/welcome_not_verified.rb +++ b/db/pages/welcome_not_verified.rb @@ -13,8 +13,6 @@ def generate_content(page)
  • #{I18n.t("welcome.welcome.user_permission_votes")}
    • -

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

    - #{I18n.t("welcome.welcome.user_permission_verify_my_account")}