Use the same I18n key for "verify account" text

We were using several different keys, all of them having the same text.
2019-10-01 22:13:46 +02:00
parent 78c6f6f7e9
commit 2ccc283bb7
19 changed files with 15 additions and 26 deletions
--- a/app/views/budgets/index.html.erb
+++ b/app/views/budgets/index.html.erb
@@ -38,8 +38,7 @@
              <% else %>
                <div class="callout warning margin-top">
                  <%= t("budgets.investments.index.sidebar.verified_only",
-                      verify: link_to(t("budgets.investments.index.sidebar.verify_account"),
-                                      verification_path)).html_safe %>
+                        verify: link_to(t("users.verify_account"), verification_path)).html_safe %>
                </div>
              <% end %>
            <% else %>
--- a/app/views/budgets/investments/_ballot.html.erb
+++ b/app/views/budgets/investments/_ballot.html.erb
@@ -43,7 +43,7 @@
  <% if reason.present? && !ballot.has_investment?(investment) %>

    <div class="js-participation-not-allowed participation-not-allowed" style="display:none">
-      <% verify_account = link_to(t("votes.verify_account"), verification_path) %>
+      <% verify_account = link_to(t("users.verify_account"), verification_path) %>
      <% signin = link_to(t("users.signin"), new_user_session_path) %>
      <% signup = link_to(t("users.signup"), new_user_registration_path) %>
      <% my_heading = link_to(investment.heading.name,
--- a/app/views/budgets/investments/_sidebar.html.erb
+++ b/app/views/budgets/investments/_sidebar.html.erb
@@ -7,8 +7,7 @@
  <% else %>
    <div class="callout warning">
      <%= t("budgets.investments.index.sidebar.verified_only",
-          verify: link_to(t("budgets.investments.index.sidebar.verify_account"),
-                  verification_path)).html_safe %>
+          verify: link_to(t("users.verify_account"), verification_path)).html_safe %>
    </div>
  <% end %>
 <% end %>
--- a/app/views/budgets/investments/_votes.html.erb
+++ b/app/views/budgets/investments/_votes.html.erb
@@ -33,7 +33,7 @@
        <small>
          <%= t("votes.budget_investments.#{reason}",
                count: investment.group.max_votable_headings,
-                verify_account: link_to(t("votes.verify_account"), verification_path),
+                verify_account: link_to(t("users.verify_account"), verification_path),
                signin: link_to(t("users.signin"), new_user_session_path),
                signup: link_to(t("users.signup"), new_user_registration_path),
                supported_headings: (current_user && current_user.headings_voted_within_group(investment.group).map(&:name).sort.to_sentence)
--- a/app/views/budgets/show.html.erb
+++ b/app/views/budgets/show.html.erb
@@ -24,7 +24,7 @@
          <% else %>
            <div class="callout warning margin-top">
              <%= t("budgets.investments.index.sidebar.verified_only",
-                  verify: link_to(t("budgets.investments.index.sidebar.verify_account"), verification_path)).html_safe %>
+                  verify: link_to(t("users.verify_account"), verification_path)).html_safe %>
            </div>
          <% end %>
        <% else %>
--- a/app/views/comments/_comment_tree.html.erb
+++ b/app/views/comments/_comment_tree.html.erb
@@ -24,7 +24,7 @@
          <% elsif require_verified_resident_for_commentable?(commentable, current_user) %>
            <br>
            <div data-alert class="callout primary">
-              <%= t("comments.verified_only", verify_account: link_to(t("comments.verify_account"), verification_path)).html_safe %>
+              <%= t("comments.verified_only", verify_account: link_to(t("users.verify_account"), verification_path)).html_safe %>
            </div>
          <% elsif allow_comments %>
            <%= render "comments/form", { commentable: commentable,
--- a/app/views/debates/_votes.html.erb
+++ b/app/views/debates/_votes.html.erb
@@ -53,7 +53,7 @@
    <div class="participation-not-allowed" style="display:none" aria-hidden="false">
      <p>
        <%= t("votes.anonymous",
-            verify_account: link_to(t("votes.verify_account"), verification_path)).html_safe %>
+              verify_account: link_to(t("users.verify_account"), verification_path)).html_safe %>
      </p>
    </div>
  <% elsif !user_signed_in? %>
--- a/app/views/direct_messages/new.html.erb
+++ b/app/views/direct_messages/new.html.erb
@@ -38,8 +38,7 @@
      <div class="callout warning">
        <p>
          <%= t("users.direct_messages.new.verified_only",
-          verify_account: link_to(t("users.direct_messages.new.verify_account"),
-                                    verification_path)).html_safe %>
+                verify_account: link_to(t("users.verify_account"), verification_path)).html_safe %>
        </p>
      </div>
    <% end %>
--- a/app/views/legislation/proposals/_featured_votes.html.erb
+++ b/app/views/legislation/proposals/_featured_votes.html.erb
@@ -23,7 +23,7 @@
    <div class="participation-not-allowed" style="display:none" aria-hidden="false">
      <p>
        <%= t("votes.verified_only",
-            verify_account: link_to(t("votes.verify_account"), verification_path)).html_safe %>
+            verify_account: link_to(t("users.verify_account"), verification_path)).html_safe %>
      </p>
    </div>
  <% elsif !user_signed_in? %>
--- a/app/views/legislation/proposals/_votes.html.erb
+++ b/app/views/legislation/proposals/_votes.html.erb
@@ -55,7 +55,7 @@
    <div class="participation-not-allowed" style="display:none" aria-hidden="false">
      <p>
        <%= t("legislation.proposals.not_verified",
-            verify_account: link_to(t("votes.verify_account"), verification_path)).html_safe %>
+            verify_account: link_to(t("users.verify_account"), verification_path)).html_safe %>
      </p>
    </div>
  <% elsif !user_signed_in? %>
--- a/app/views/legislation/questions/_participation_not_allowed.html.erb
+++ b/app/views/legislation/questions/_participation_not_allowed.html.erb
@@ -8,7 +8,7 @@
  <div class="participation-not-allowed" style="display:none" aria-hidden="false">
    <p>
      <%= t("legislation.questions.participation.verified_only",
-          verify_account: link_to(t("legislation.questions.participation.verify_account"), verification_path)).html_safe %>
+          verify_account: link_to(t("users.verify_account"), verification_path)).html_safe %>
    </p>
  </div>
 <% elsif !user_signed_in? %>
--- a/app/views/proposals/_featured_votes.html.erb
+++ b/app/views/proposals/_featured_votes.html.erb
@@ -23,7 +23,7 @@
    <div class="participation-not-allowed" style="display:none" aria-hidden="false">
      <p>
        <%= t("votes.verified_only",
-            verify_account: link_to(t("votes.verify_account"), verification_path)).html_safe %>
+            verify_account: link_to(t("users.verify_account"), verification_path)).html_safe %>
      </p>
    </div>
  <% elsif !user_signed_in? %>
--- a/app/views/proposals/_votes.html.erb
+++ b/app/views/proposals/_votes.html.erb
@@ -30,7 +30,7 @@
      <div class="participation-not-allowed" style="display:none" aria-hidden="false">
        <p>
          <%= t("votes.verified_only",
-              verify_account: link_to(t("votes.verify_account"), verification_path)).html_safe %>
+              verify_account: link_to(t("users.verify_account"), verification_path)).html_safe %>
        </p>
      </div>
    </div>
--- a/config/locales/en/budgets.yml
+++ b/config/locales/en/budgets.yml
@@ -95,7 +95,6 @@ en:
          check_ballot_link: "check and confirm my ballot"
          zero: You have not voted any investment project in this group.
          verified_only: "To create a new budget investment %{verify}."
-          verify_account: "verify your account"
          create: "Create a budget investment"
          not_logged_in: "To create a new budget investment you must %{sign_in} or %{sign_up}."
          by_feasibility: By feasibility
--- a/config/locales/en/general.yml
+++ b/config/locales/en/general.yml
@@ -41,7 +41,6 @@ en:
  comments:
    comments_closed: Comments are closed
    verified_only: To participate %{verify_account}
-    verify_account: verify your account
    comment:
      admin: Administrator
      author: Author
@@ -860,6 +859,7 @@ en:
    login_to_continue: "You must %{signin} or %{signup} to continue."
    signin: "sign in"
    signup: "sign up"
+    verify_account: "verify your account"
    direct_messages:
      new:
        body_label: Message
@@ -868,7 +868,6 @@ en:
        title: Send private message to %{receiver}
        title_label: Title
        verified_only: To send a private message %{verify_account}
-        verify_account: verify your account
      show:
        receiver: Message sent to %{receiver}
    show:
@@ -918,7 +917,6 @@ en:
    organizations: Organizations are not permitted to vote
    supports: Supports
    verified_only: Only verified users can vote on proposals; %{verify_account}.
-    verify_account: verify your account
    budget_investments:
      not_logged_in: You must %{signin} or %{signup} to continue.
      not_verified: Only verified users can vote on investment projects; %{verify_account}.
--- a/config/locales/en/legislation.yml
+++ b/config/locales/en/legislation.yml
@@ -115,7 +115,6 @@ en:
        organizations: Organisations are not permitted to participate in the debate
        unauthenticated: You must %{signin} or %{signup} to participate.
        verified_only: Only verified users can participate, %{verify_account}.
-        verify_account: verify your account
        debate_phase_not_open: Debate phase has finished and answers are not accepted anymore
    shared:
      share: Share
--- a/config/locales/es/budgets.yml
+++ b/config/locales/es/budgets.yml
@@ -95,7 +95,6 @@ es:
          check_ballot_link: "revisar y confirmar mis votos"
          zero: Todavía no has votado ningún proyecto de gasto en este ámbito del presupuesto.
          verified_only: "Para crear un nuevo proyecto de gasto %{verify}."
-          verify_account: "verifica tu cuenta"
          create: "Crear proyecto de gasto"
          not_logged_in: "Para crear un nuevo proyecto de gasto debes %{sign_in} o %{sign_up}."
          by_feasibility: Por viabilidad
--- a/config/locales/es/general.yml
+++ b/config/locales/es/general.yml
@@ -41,7 +41,6 @@ es:
  comments:
    comments_closed: Los comentarios están cerrados
    verified_only: Para participar %{verify_account}
-    verify_account: verifica tu cuenta
    comment:
      admin: Administrador
      author: Autor
@@ -857,6 +856,7 @@ es:
    login_to_continue: "Necesitas %{signin} o %{signup} para continuar."
    signin: "iniciar sesión"
    signup: "registrarte"
+    verify_account: "verifica tu cuenta"
    direct_messages:
      new:
        body_label: Mensaje
@@ -865,7 +865,6 @@ es:
        title: Enviar mensaje privado a %{receiver}
        title_label: Título
        verified_only: Para enviar un mensaje privado %{verify_account}
-        verify_account: verifica tu cuenta
      show:
        receiver: Mensaje enviado a %{receiver}
    show:
@@ -915,7 +914,6 @@ es:
    organizations: Las organizaciones no pueden votar.
    supports: Apoyos
    verified_only: Las propuestas sólo pueden ser votadas por usuarios verificados, %{verify_account}.
-    verify_account: verifica tu cuenta
    budget_investments:
      not_logged_in: Necesitas %{signin} o %{signup} para continuar.
      not_verified: Los proyectos de gasto sólo pueden ser apoyadas por usuarios verificados, %{verify_account}.
--- a/config/locales/es/legislation.yml
+++ b/config/locales/es/legislation.yml
@@ -114,7 +114,6 @@ es:
        organizations: Las organizaciones no pueden participar en el debate
        unauthenticated: Necesitas %{signin} o %{signup} para participar en el debate.
        verified_only: Solo los usuarios verificados pueden participar en el debate, %{verify_account}.
-        verify_account: verifica tu cuenta
        debate_phase_not_open: La fase de debate previo ya ha finalizado y en este momento no se aceptan respuestas
    shared:
      share: Compartir