Merge pull request #3741 from consul/extract_vote_message

Extract partials to show "sign in to vote" message
2019-10-05 14:58:54 +02:00
parent f018706e6b 86a205c8fc
commit deba0b1a75
47 changed files with 88 additions and 197 deletions
--- a/app/helpers/links_helper.rb
+++ b/app/helpers/links_helper.rb
@@ -4,4 +4,16 @@ module LinksHelper
                                                     t("links.form.delete_button"),
                                                     builder, class: "delete remove-element"
  end
+
+  def link_to_signin(options = {})
+    link_to t("users.signin"), new_user_session_path, options
+  end
+
+  def link_to_signup(options = {})
+    link_to t("users.signup"), new_user_registration_path, options
+  end
+
+  def link_to_verify_account
+    link_to t("users.verify_account"), verification_path
+  end
 end
--- a/app/views/budgets/index.html.erb
+++ b/app/views/budgets/index.html.erb
@@ -38,17 +38,13 @@
              <% 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_verify_account).html_safe %>
                </div>
              <% end %>
            <% else %>
              <div class="callout primary margin-top">
                <%= t("budgets.investments.index.sidebar.not_logged_in",
-                      sign_in: link_to(t("budgets.investments.index.sidebar.sign_in"),
-                      new_user_session_path),
-                      sign_up: link_to(t("budgets.investments.index.sidebar.sign_up"),
-                      new_user_registration_path)).html_safe %>
+                      sign_in: link_to_signin, sign_up: link_to_signup).html_safe %>
              </div>
            <% end %>
          <% end %>
--- a/app/views/budgets/investments/_ballot.html.erb
+++ b/app/views/budgets/investments/_ballot.html.erb
@@ -43,10 +43,6 @@
  <% 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) %>
-      <% signin = link_to(t("votes.signin"), new_user_session_path) %>
-      <% signup = link_to(t("votes.signup"), new_user_registration_path) %>
      <% my_heading = link_to(investment.heading.name,
                      budget_investments_path(budget_id: investment.budget_id,
                                              heading_id: investment.heading_id)) %>
@@ -56,8 +52,8 @@
      <p>
        <small>
          <%= t("budgets.ballots.reasons_for_not_balloting.#{reason}",
-                verify_account: verify_account, signin: signin,
-                signup: signup, my_heading: my_heading,
+                verify_account: link_to_verify_account, signin: link_to_signin,
+                signup: link_to_signup, my_heading: my_heading,
                change_ballot: change_ballot,
                heading_link: heading_link(@assigned_heading, @budget)).html_safe %>
        </small>
--- 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_verify_account).html_safe %>
    </div>
  <% end %>
 <% end %>
--- a/app/views/budgets/investments/_votes.html.erb
+++ b/app/views/budgets/investments/_votes.html.erb
@@ -33,9 +33,9 @@
        <small>
          <%= t("votes.budget_investments.#{reason}",
                count: investment.group.max_votable_headings,
-                verify_account: link_to(t("votes.verify_account"), verification_path),
-                signin: link_to(t("votes.signin"), new_user_session_path),
-                signup: link_to(t("votes.signup"), new_user_registration_path),
+                verify_account: link_to_verify_account,
+                signin: link_to_signin,
+                signup: link_to_signup,
                supported_headings: (current_user && current_user.headings_voted_within_group(investment.group).map(&:name).sort.to_sentence)
               ).html_safe %>
        </small>
--- a/app/views/budgets/show.html.erb
+++ b/app/views/budgets/show.html.erb
@@ -24,14 +24,13 @@
          <% 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_verify_account).html_safe %>
            </div>
          <% end %>
        <% else %>
          <div class="callout primary margin-top">
            <%= t("budgets.investments.index.sidebar.not_logged_in",
-                  sign_in: link_to(t("budgets.investments.index.sidebar.sign_in"), new_user_session_path),
-                  sign_up: link_to(t("budgets.investments.index.sidebar.sign_up"), new_user_registration_path)).html_safe %>
+                  sign_in: link_to_signin, sign_up: link_to_signup).html_safe %>
          </div>
        <% end %>
      <% end %>
--- 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_verify_account).html_safe %>
            </div>
          <% elsif allow_comments %>
            <%= render "comments/form", { commentable: commentable,
@@ -34,11 +34,7 @@
          <% end %>
        <% else %>
          <br>
-          <div data-alert class="callout primary">
-            <%= t("debates.show.login_to_comment",
-                signin: link_to(t("votes.signin"), new_user_session_path),
-                signup: link_to(t("votes.signup"), new_user_registration_path)).html_safe %>
-          </div>
+          <%= render "shared/login_to_comment" %>
        <% end %>

        <% comment_tree.root_comments.each do |comment| %>
--- a/app/views/comments/_commentable_tree.html.erb
+++ b/app/views/comments/_commentable_tree.html.erb
@@ -17,13 +17,8 @@
                                        toggeable: false,
                                        valuation: valuation } %>
        <% else %>
-        <br>
-
-        <div data-alert class="callout primary">
-          <%= t("debates.show.login_to_comment",
-              signin: link_to(t("votes.signin"), new_user_session_path),
-              signup: link_to(t("votes.signup"), new_user_registration_path)).html_safe %>
-          </div>
+          <br>
+          <%= render "shared/login_to_comment" %>
        <% end %>

        <% @comment_tree.root_comments.each do |comment| %>
--- a/app/views/comments/_votes.html.erb
+++ b/app/views/comments/_votes.html.erb
@@ -82,8 +82,8 @@

    <div class="participation-not-allowed" style="display:none" aria-hidden="false">
      <%= t("votes.comment_unauthenticated",
-        signin: link_to(t("votes.signin"), new_user_session_path),
-        signup: link_to(t("votes.signup"), new_user_registration_path)).html_safe %>
+        signin: link_to_signin,
+        signup: link_to_signup).html_safe %>
    </div>
  <% end %>
 </div>
--- a/app/views/debates/_comments.html.erb
+++ b/app/views/debates/_comments.html.erb
@@ -11,13 +11,8 @@
      <% if user_signed_in? %>
        <%= render "comments/form", { commentable: @debate, parent_id: nil, toggeable: false } %>
      <% else %>
-      <br>
-
-      <div data-alert class="callout primary">
-        <%= t("debates.show.login_to_comment",
-            signin: link_to(t("votes.signin"), new_user_session_path),
-            signup: link_to(t("votes.signup"), new_user_registration_path)).html_safe %>
-        </div>
+        <br>
+        <%= render "shared/login_to_comment" %>
      <% end %>

      <% @comment_tree.root_comments.each do |comment| %>
--- a/app/views/debates/_votes.html.erb
+++ b/app/views/debates/_votes.html.erb
@@ -52,17 +52,12 @@
  <% elsif user_signed_in? && !debate.votable_by?(current_user) %>
    <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 %>
+        <%= t("votes.anonymous", verify_account: link_to_verify_account).html_safe %>
      </p>
    </div>
  <% elsif !user_signed_in? %>
    <div tabindex="0">
-      <div class="participation-not-allowed" style="display:none" aria-hidden="false">
-        <%= t("votes.unauthenticated",
-          signin: link_to(t("votes.signin"), new_user_session_path),
-          signup: link_to(t("votes.signup"), new_user_registration_path)).html_safe %>
-      </div>
+      <%= render "shared/login_to_vote" %>
    </div>
  <% end %>
 </div>
--- a/app/views/direct_messages/new.html.erb
+++ b/app/views/direct_messages/new.html.erb
@@ -9,9 +9,8 @@
    <% if not current_user %>
      <div class="callout primary">
        <p>
-          <%= t("users.direct_messages.new.authenticate",
-            signin: link_to(t("users.direct_messages.new.signin"), new_user_session_path),
-            signup: link_to(t("users.direct_messages.new.signup"), new_user_registration_path)).html_safe %>
+          <%= t("users.login_to_continue",
+            signin: link_to_signin, signup: link_to_signup).html_safe %>
        </p>
      </div>
    <% elsif not @receiver.email_on_direct_message? %>
@@ -38,8 +37,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_verify_account).html_safe %>
        </p>
      </div>
    <% end %>
--- a/app/views/legislation/annotations/_comments_box.html.erb
+++ b/app/views/legislation/annotations/_comments_box.html.erb
@@ -34,9 +34,8 @@

      <div>
        <div class="participation-not-allowed" style="display: none;" aria-hidden="false">
-          <%= t("legislation.annotations.form.login_to_comment",
-              signin: link_to(t("legislation.annotations.form.signin"), new_user_session_path),
-              signup: link_to(t("legislation.annotations.form.signup"), new_user_registration_path)).html_safe %>
+          <%= t("users.login_to_comment",
+              signin: link_to_signin, signup: link_to_signup).html_safe %>
        </div>
      </div>

--- a/app/views/legislation/annotations/_form.html.erb
+++ b/app/views/legislation/annotations/_form.html.erb
@@ -23,11 +23,7 @@
          <%= f.hidden_field :ranges %>
        <% end %>
      <% else %>
-        <div data-alert class="callout primary">
-          <%= t("legislation.annotations.form.login_to_comment",
-              signin: link_to(t("legislation.annotations.form.signin"), new_user_session_path),
-              signup: link_to(t("legislation.annotations.form.signup"), new_user_registration_path)).html_safe %>
-        </div>
+        <%= render "shared/login_to_comment" %>
      <% end %>
    </div>
  </div>
--- a/app/views/legislation/processes/_help_gif.html.erb
+++ b/app/views/legislation/processes/_help_gif.html.erb
@@ -12,8 +12,7 @@
        <% else %>
          <p>
            <%= t("annotator.help.text",
-                sign_in: link_to(t("annotator.help.text_sign_in"), new_user_session_path),
-                sign_up: link_to(t("annotator.help.text_sign_up"), new_user_registration_path)).html_safe %>
+                sign_in: link_to_signin, sign_up: link_to_signup).html_safe %>
          </p>
        <% end %>

--- a/app/views/legislation/proposals/_comments.html.erb
+++ b/app/views/legislation/proposals/_comments.html.erb
@@ -6,13 +6,8 @@
      <% if user_signed_in? %>
        <%= render "comments/form", { commentable: @proposal, parent_id: nil, toggeable: false } %>
      <% else %>
-      <br>
-
-      <div data-alert class="callout primary">
-        <%= t("proposals.show.login_to_comment",
-            signin: link_to(t("votes.signin"), new_user_session_path),
-            signup: link_to(t("votes.signup"), new_user_registration_path)).html_safe %>
-        </div>
+        <br>
+        <%= render "shared/login_to_comment" %>
      <% end %>

      <% @comment_tree.root_comments.each do |comment| %>
--- a/app/views/legislation/proposals/_featured_votes.html.erb
+++ b/app/views/legislation/proposals/_featured_votes.html.erb
@@ -22,16 +22,11 @@
  <% elsif user_signed_in? && !proposal.votable_by?(current_user) %>
    <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 %>
+        <%= t("votes.verified_only", verify_account: link_to_verify_account).html_safe %>
      </p>
    </div>
  <% elsif !user_signed_in? %>
-    <div class="participation-not-allowed" style="display:none" aria-hidden="false">
-      <%= t("votes.unauthenticated",
-        signin: link_to(t("votes.signin"), new_user_session_path),
-        signup: link_to(t("votes.signup"), new_user_registration_path)).html_safe %>
-    </div>
+    <%= render "shared/login_to_vote" %>
  <% end %>

  <% if voted_for?(@featured_proposals_votes, proposal) %>
--- a/app/views/legislation/proposals/_votes.html.erb
+++ b/app/views/legislation/proposals/_votes.html.erb
@@ -55,16 +55,12 @@
    <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_verify_account).html_safe %>
      </p>
    </div>
  <% elsif !user_signed_in? %>
    <div tabindex="0">
-      <div class="participation-not-allowed" style="display:none" aria-hidden="false">
-        <%= t("votes.unauthenticated",
-          signin: link_to(t("votes.signin"), new_user_session_path),
-          signup: link_to(t("votes.signup"), new_user_registration_path)).html_safe %>
-      </div>
+      <%= render "shared/login_to_vote" %>
    </div>
  <% end %>

--- a/app/views/legislation/questions/_participation_not_allowed.html.erb
+++ b/app/views/legislation/questions/_participation_not_allowed.html.erb
@@ -8,14 +8,13 @@
  <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_verify_account).html_safe %>
    </p>
  </div>
 <% elsif !user_signed_in? %>
  <div class="participation-not-allowed" style="display:none" aria-hidden="false">
    <%= t("legislation.questions.participation.unauthenticated",
-      signin: link_to(t("legislation.questions.participation.signin"), new_user_session_path),
-      signup: link_to(t("legislation.questions.participation.signup"), new_user_registration_path)).html_safe %>
+          signin: link_to_signin, signup: link_to_signup).html_safe %>
  </div>
 <% elsif !@process.debate_phase.open? %>
  <div class="participation-not-allowed" style="display:none" aria-hidden="false">
--- a/app/views/polls/_callout.html.erb
+++ b/app/views/polls/_callout.html.erb
@@ -2,8 +2,8 @@
  <% if current_user.nil? %>
    <div class="callout primary">
      <%= t("polls.show.cant_answer_not_logged_in",
-            signin: link_to(t("polls.show.signin"), new_user_session_path, class: "probe-message"),
-            signup: link_to(t("polls.show.signup"), new_user_registration_path, class: "probe-message")).html_safe %>
+            signin: link_to_signin(class: "probe-message"),
+            signup: link_to_signup(class: "probe-message")).html_safe %>
    </div>
  <% elsif current_user.unverified? %>
    <div class="callout warning">
--- a/app/views/polls/_comments.html.erb
+++ b/app/views/polls/_comments.html.erb
@@ -6,13 +6,8 @@
      <% if user_signed_in? %>
        <%= render "comments/form", { commentable: @poll, parent_id: nil, toggeable: false } %>
      <% else %>
-      <br>
-
-      <div data-alert class="callout primary">
-        <%= t("polls.show.login_to_comment",
-            signin: link_to(t("votes.signin"), new_user_session_path),
-            signup: link_to(t("votes.signup"), new_user_registration_path)).html_safe %>
-        </div>
+        <br>
+        <%= render "shared/login_to_comment" %>
      <% end %>

      <% @comment_tree.root_comments.each do |comment| %>
--- a/app/views/proposals/_comments.html.erb
+++ b/app/views/proposals/_comments.html.erb
@@ -6,13 +6,8 @@
      <% if user_signed_in? %>
        <%= render "comments/form", { commentable: @proposal, parent_id: nil, toggeable: false } %>
      <% else %>
-      <br>
-
-      <div data-alert class="callout primary">
-        <%= t("proposals.show.login_to_comment",
-            signin: link_to(t("votes.signin"), new_user_session_path),
-            signup: link_to(t("votes.signup"), new_user_registration_path)).html_safe %>
-        </div>
+        <br>
+        <%= render "shared/login_to_comment" %>
      <% end %>

      <% @comment_tree.root_comments.each do |comment| %>
--- a/app/views/proposals/_featured_votes.html.erb
+++ b/app/views/proposals/_featured_votes.html.erb
@@ -22,16 +22,11 @@
  <% elsif user_signed_in? && !proposal.votable_by?(current_user) %>
    <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 %>
+        <%= t("votes.verified_only", verify_account: link_to_verify_account).html_safe %>
      </p>
    </div>
  <% elsif !user_signed_in? %>
-    <div class="participation-not-allowed" style="display:none" aria-hidden="false">
-      <%= t("votes.unauthenticated",
-        signin: link_to(t("votes.signin"), new_user_session_path),
-        signup: link_to(t("votes.signup"), new_user_registration_path)).html_safe %>
-    </div>
+    <%= render "shared/login_to_vote" %>
  <% end %>

  <% if voted_for?(@featured_proposals_votes, proposal) %>
--- a/app/views/proposals/_votes.html.erb
+++ b/app/views/proposals/_votes.html.erb
@@ -29,18 +29,13 @@
    <div tabindex="0">
      <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 %>
+          <%= t("votes.verified_only", verify_account: link_to_verify_account).html_safe %>
        </p>
      </div>
    </div>
  <% elsif !user_signed_in? %>
    <div tabindex="0">
-      <div class="participation-not-allowed" style="display:none" aria-hidden="false">
-        <%= t("votes.unauthenticated",
-          signin: link_to(t("votes.signin"), new_user_session_path),
-          signup: link_to(t("votes.signup"), new_user_registration_path)).html_safe %>
-      </div>
+      <%= render "shared/login_to_vote" %>
    </div>
  <% end %>

--- a/app/views/shared/_login_to_comment.html.erb
+++ b/app/views/shared/_login_to_comment.html.erb
@@ -0,0 +1,3 @@
+<div data-alert class="callout primary">
+  <%= t("users.login_to_comment", signin: link_to_signin, signup: link_to_signup).html_safe %>
+</div>
--- a/app/views/shared/_login_to_vote.html.erb
+++ b/app/views/shared/_login_to_vote.html.erb
@@ -0,0 +1,3 @@
+<div class="participation-not-allowed" style="display:none" aria-hidden="false">
+  <%= t("users.login_to_continue", signin: link_to_signin, signup: link_to_signup).html_safe %>
+</div>
--- a/app/views/topics/_comments.html.erb
+++ b/app/views/topics/_comments.html.erb
@@ -13,14 +13,8 @@
      <% if user_signed_in? %>
        <%= render "comments/form", { commentable: @topic, parent_id: nil, toggeable: false } %>
      <% else %>
-
-      <div data-alert class="callout primary">
-        <%= t("topics.show.login_to_comment",
-            signin: link_to(t("votes.signin"), new_user_session_path),
-            signup: link_to(t("votes.signup"), new_user_registration_path)).html_safe %>
-      </div>
+        <%= render "shared/login_to_comment" %>
      <% end %>
-
    </div>
  </div>
 <% end %>
--- a/app/views/topics/_informative_text.html.erb
+++ b/app/views/topics/_informative_text.html.erb
@@ -7,7 +7,6 @@
 <% else %>
  <div class="callout primary">
    <%= t("community.show.create_first_community_topic.sub_first_theme",
-          sign_in: link_to(t("community.show.create_first_community_topic.sign_in"), new_user_session_path),
-          sign_up: link_to(t("community.show.create_first_community_topic.sign_up"), new_user_registration_path)).html_safe %>
+          sign_in: link_to_signin, sign_up: link_to_signup).html_safe %>
  </div>
 <% end %>
--- a/config/locales/en/budgets.yml
+++ b/config/locales/en/budgets.yml
@@ -95,11 +95,8 @@ 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}."
-          sign_in: "sign in"
-          sign_up: "sign up"
          by_feasibility: By feasibility
          feasible: Feasible projects
          unfeasible: Unfeasible projects
--- a/config/locales/en/community.yml
+++ b/config/locales/en/community.yml
@@ -17,8 +17,6 @@ en:
        first_theme_not_logged_in: No issue available, participate creating the first one.
        first_theme: Create the first community topic
        sub_first_theme: "To create a theme you must %{sign_in} or %{sign_up}."
-        sign_in: "sign in"
-        sign_up: "sign up"
      tab:
        participants: Participants
      sidebar:
@@ -55,6 +53,3 @@ en:
        recommendation_one: Do not write the topic title or whole sentences in capital letters. On the internet that is considered shouting. And no one likes to be yelled at.
        recommendation_two: Any topic or comment that implies an illegal action will be eliminated, also those that intend to sabotage the spaces of the subject, everything else is allowed.
        recommendation_three: Enjoy this space, the voices that fill it, it's yours too.
-  topics:
-    show:
-      login_to_comment: You must %{signin} or %{signup} to leave a comment.
--- 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
@@ -164,7 +163,6 @@ en:
      comments_title: Comments
      edit_debate_link: Edit
      flag: This debate has been flagged as inappropriate by several users.
-      login_to_comment: You must %{signin} or %{signup} to leave a comment.
      share: Share
      author: Author
    update:
@@ -462,7 +460,6 @@ en:
      comments_tab: Comments
      dashboard_proposal_link: Dashboard
      flag: This proposal has been flagged as inappropriate by several users.
-      login_to_comment: You must %{signin} or %{signup} to leave a comment.
      notifications_tab: Notifications
      milestones_tab: Milestones
      retired_warning: "The author considers this proposal should not receive more supports."
@@ -667,9 +664,6 @@ en:
      back: Back to voting
      cant_answer_not_logged_in: "You must %{signin} or %{signup} to participate."
      comments_tab: Comments
-      login_to_comment: You must %{signin} or %{signup} to leave a comment.
-      signin: Sign in
-      signup: Sign up
      cant_answer_verify_html: "You must %{verify_link} in order to answer."
      verify_link: "verify your account"
      cant_answer_expired: "This poll has finished."
@@ -861,6 +855,11 @@ en:
    manage:
      all: "You do not have permission to carry out the action '%{action}' on %{subject}."
  users:
+    login_to_comment: "You must %{signin} or %{signup} to leave a comment."
+    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
@@ -869,10 +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
-        authenticate: You must %{signin} or %{signup} to continue.
-        signin: sign in
-        signup: sign up
      show:
        receiver: Message sent to %{receiver}
    show:
@@ -920,12 +915,8 @@ en:
    comment_unauthenticated: You must %{signin} or %{signup} to vote.
    disagree: I disagree
    organizations: Organizations are not permitted to vote
-    signin: Sign in
-    signup: Sign up
    supports: Supports
-    unauthenticated: You must %{signin} or %{signup} to continue.
    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}.
@@ -1004,8 +995,6 @@ en:
    help:
      alt: Select the text you want to comment and press the button with the pencil.
      text: To comment this document you must %{sign_in} or %{sign_up}. Then select the text you want to comment and press the button with the pencil.
-      text_sign_in: login
-      text_sign_up: sign up
      title: How I can comment this document?
  links:
    form:
--- a/config/locales/en/legislation.yml
+++ b/config/locales/en/legislation.yml
@@ -14,9 +14,6 @@ en:
        publish_comment: Publish Comment
      form:
        phase_not_open: This phase is not open
-        login_to_comment: You must %{signin} or %{signup} to leave a comment.
-        signin: Sign in
-        signup: Sign up
      index:
        title: Comments
        comments_about: Comments about
@@ -116,11 +113,8 @@ en:
      participation:
        phase_not_open: This phase is not open
        organizations: Organisations are not permitted to participate in the debate
-        signin: Sign in
-        signup: Sign up
        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,11 +95,8 @@ 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}."
-          sign_in: "iniciar sesión"
-          sign_up: "registrarte"
          by_feasibility: Por viabilidad
          feasible: Ver los proyectos viables
          unfeasible: Ver los proyectos inviables
--- a/config/locales/es/community.yml
+++ b/config/locales/es/community.yml
@@ -17,8 +17,6 @@ es:
        first_theme_not_logged_in: No hay ningún tema disponible, participa creando el primero.
        first_theme: Crea el primer tema de la comunidad
        sub_first_theme: "Para crear un tema debes %{sign_in} o %{sign_up}."
-        sign_in: "iniciar sesión"
-        sign_up: "registrarte"
      tab:
        participants: Participantes
      sidebar:
@@ -55,6 +53,3 @@ es:
        recommendation_one: No escribas el título del tema o frases enteras en mayúsculas. En internet eso se considera gritar. Y a nadie le gusta que le griten.
        recommendation_two: Cualquier tema o comentario que implique una acción ilegal será eliminada, también las que tengan la intención de sabotear los espacios del tema, todo lo demás está permitido.
        recommendation_three: Disfruta de este espacio, de las voces que lo llenan, también es tuyo
-  topics:
-    show:
-      login_to_comment: Necesitas %{signin} o %{signup} para comentar.
--- 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
@@ -164,7 +163,6 @@ es:
      comments_title: Comentarios
      edit_debate_link: Editar debate
      flag: Este debate ha sido marcado como inapropiado por varios usuarios.
-      login_to_comment: Necesitas %{signin} o %{signup} para comentar.
      share: Compartir
      author: Autor
    update:
@@ -462,7 +460,6 @@ es:
      comments_tab: Comentarios
      dashboard_proposal_link: Panel de control
      flag: Esta propuesta ha sido marcada como inapropiada por varios usuarios.
-      login_to_comment: Necesitas %{signin} o %{signup} para comentar.
      notifications_tab: Notificaciones
      milestones_tab: Seguimiento
      retired_warning: "El autor de esta propuesta considera que ya no debe seguir recogiendo apoyos."
@@ -665,9 +662,6 @@ es:
      back: Volver a votaciones
      cant_answer_not_logged_in: "Necesitas %{signin} o %{signup} para participar."
      comments_tab: Comentarios
-      login_to_comment: Necesitas %{signin} o %{signup} para comentar.
-      signin: iniciar sesión
-      signup: registrarte
      cant_answer_verify_html: "Por favor %{verify_link} para poder responder."
      verify_link: "verifica tu cuenta"
      cant_answer_expired: "Esta votación ha terminado."
@@ -858,6 +852,11 @@ es:
    manage:
      all: "No tienes permiso para realizar la acción '%{action}' sobre %{subject}."
  users:
+    login_to_comment: "Necesitas %{signin} o %{signup} para comentar."
+    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
@@ -866,10 +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
-        authenticate: Necesitas %{signin} o %{signup}.
-        signin: iniciar sesión
-        signup: registrarte
      show:
        receiver: Mensaje enviado a %{receiver}
    show:
@@ -917,12 +912,8 @@ es:
    comment_unauthenticated: Necesitas %{signin} o %{signup} para poder votar.
    disagree: No estoy de acuerdo
    organizations: Las organizaciones no pueden votar.
-    signin: iniciar sesión
-    signup: registrarte
    supports: Apoyos
-    unauthenticated: Necesitas %{signin} o %{signup} para continuar.
    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
@@ -14,9 +14,6 @@ es:
        publish_comment: Publicar Comentario
      form:
        phase_not_open: Esta fase del proceso no está abierta
-        login_to_comment: Necesitas %{signin} o %{signup} para comentar.
-        signin: iniciar sesión
-        signup: registrarte
      index:
        title: Comentarios
        comments_about: Comentarios sobre
@@ -115,11 +112,8 @@ es:
      participation:
        phase_not_open: Esta fase no está abierta
        organizations: Las organizaciones no pueden participar en el debate
-        signin: iniciar sesión
-        signup: registrarte
        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
--- a/spec/features/budgets/ballots_spec.rb
+++ b/spec/features/budgets/ballots_spec.rb
@@ -516,7 +516,7 @@ describe "Ballots" do

      within("#budget_investment_#{investment.id}") do
        find("div.ballot").hover
-        expect(page).to have_content "You must Sign in or Sign up to continue."
+        expect(page).to have_content "You must sign in or sign up to continue."
        expect(page).to have_selector(".in-favor a", visible: false)
      end
    end
--- a/spec/features/comments/budget_investments_spec.rb
+++ b/spec/features/comments/budget_investments_spec.rb
@@ -182,7 +182,7 @@ describe "Commenting Budget::Investments" do
      create(:comment, commentable: investment)
      visit budget_investment_path(investment.budget, investment)

-      expect(page).to have_content "You must Sign in or Sign up to leave a comment"
+      expect(page).to have_content "You must sign in or sign up to leave a comment"
      within("#comments") do
        expect(page).not_to have_content "Write a comment"
        expect(page).not_to have_content "Reply"
--- a/spec/features/comments/debates_spec.rb
+++ b/spec/features/comments/debates_spec.rb
@@ -179,7 +179,7 @@ describe "Commenting debates" do
      create(:comment, commentable: debate)
      visit debate_path(debate)

-      expect(page).to have_content "You must Sign in or Sign up to leave a comment"
+      expect(page).to have_content "You must sign in or sign up to leave a comment"
      within("#comments") do
        expect(page).not_to have_content "Write a comment"
        expect(page).not_to have_content "Reply"
--- a/spec/features/comments/legislation_annotations_spec.rb
+++ b/spec/features/comments/legislation_annotations_spec.rb
@@ -214,7 +214,7 @@ describe "Commenting legislation questions" do
                                                              legislation_annotation.draft_version,
                                                              legislation_annotation)

-      expect(page).to have_content "You must Sign in or Sign up to leave a comment"
+      expect(page).to have_content "You must sign in or sign up to leave a comment"
      within("#comments") do
        expect(page).not_to have_content "Write a comment"
        expect(page).not_to have_content "Reply"
--- a/spec/features/comments/legislation_questions_spec.rb
+++ b/spec/features/comments/legislation_questions_spec.rb
@@ -186,7 +186,7 @@ describe "Commenting legislation questions" do
      create(:comment, commentable: legislation_question)
      visit legislation_process_question_path(legislation_question.process, legislation_question)

-      expect(page).to have_content "You must Sign in or Sign up to leave a comment"
+      expect(page).to have_content "You must sign in or sign up to leave a comment"
      within("#comments") do
        expect(page).not_to have_content "Write a comment"
        expect(page).not_to have_content "Reply"
--- a/spec/features/comments/polls_spec.rb
+++ b/spec/features/comments/polls_spec.rb
@@ -180,7 +180,7 @@ describe "Commenting polls" do
      create(:comment, commentable: poll)
      visit poll_path(poll)

-      expect(page).to have_content "You must Sign in or Sign up to leave a comment"
+      expect(page).to have_content "You must sign in or sign up to leave a comment"
      within("#comments") do
        expect(page).not_to have_content "Write a comment"
        expect(page).not_to have_content "Reply"
--- a/spec/features/comments/proposals_spec.rb
+++ b/spec/features/comments/proposals_spec.rb
@@ -178,7 +178,7 @@ describe "Commenting proposals" do
      create(:comment, commentable: proposal)
      visit proposal_path(proposal)

-      expect(page).to have_content "You must Sign in or Sign up to leave a comment"
+      expect(page).to have_content "You must sign in or sign up to leave a comment"
      within("#comments") do
        expect(page).not_to have_content "Write a comment"
        expect(page).not_to have_content "Reply"
--- a/spec/features/comments/topics_spec.rb
+++ b/spec/features/comments/topics_spec.rb
@@ -196,7 +196,7 @@ describe "Commenting topics from proposals" do

      visit community_topic_path(community, topic)

-      expect(page).to have_content "You must Sign in or Sign up to leave a comment"
+      expect(page).to have_content "You must sign in or sign up to leave a comment"
      within("#comments") do
        expect(page).not_to have_content "Write a comment"
        expect(page).not_to have_content "Reply"
@@ -747,7 +747,7 @@ describe "Commenting topics from budget investments" do

      visit community_topic_path(community, topic)

-      expect(page).to have_content "You must Sign in or Sign up to leave a comment"
+      expect(page).to have_content "You must sign in or sign up to leave a comment"
      within("#comments") do
        expect(page).not_to have_content "Write a comment"
        expect(page).not_to have_content "Reply"
--- a/spec/features/legislation/draft_versions_spec.rb
+++ b/spec/features/legislation/draft_versions_spec.rb
@@ -168,7 +168,7 @@ describe "Legislation Draft Versions" do
      page.find(:css, ".legislation-annotatable").double_click
      page.find(:css, ".annotator-adder button").click
      expect(page).not_to have_css("#legislation_annotation_text")
-      expect(page).to have_content "You must Sign in or Sign up to leave a comment."
+      expect(page).to have_content "You must sign in or sign up to leave a comment."
    end

    scenario "Create" do
--- a/spec/features/polls/polls_spec.rb
+++ b/spec/features/polls/polls_spec.rb
@@ -192,7 +192,7 @@ describe "Polls" do

      visit poll_path(poll)

-      expect(page).to have_content("You must Sign in or Sign up to participate")
+      expect(page).to have_content("You must sign in or sign up to participate")
      expect(page).to have_link("Yes", href: new_user_session_path)
      expect(page).to have_link("No", href: new_user_session_path)
    end
--- a/spec/support/common_actions/votes.rb
+++ b/spec/support/common_actions/votes.rb
@@ -1,11 +1,11 @@
 module Votes
  def expect_message_you_need_to_sign_in
-    expect(page).to have_content "You must Sign in or Sign up to continue"
+    expect(page).to have_content "You must sign in or sign up to continue"
    expect(page).to have_selector(".in-favor", visible: false)
  end

  def expect_message_you_need_to_sign_in_to_vote_comments
-    expect(page).to have_content "You must Sign in or Sign up to vote"
+    expect(page).to have_content "You must sign in or sign up to vote"
    expect(page).to have_selector(".participation-allowed", visible: false)
    expect(page).to have_selector(".participation-not-allowed", visible: true)
  end