Use the same key for "signin" and "signup" texts

We were using the same texts in several places

app/views/budgets/index.html.erb

@@ -45,10 +45,9 @@
             <% 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"),
+                      sign_in: link_to(t("users.signin"), new_user_session_path),
-                      new_user_session_path),
+                      sign_up: link_to(t("users.signup"), new_user_registration_path)
-                      sign_up: link_to(t("budgets.investments.index.sidebar.sign_up"),
+                     ).html_safe %>
-                      new_user_registration_path)).html_safe %>
               </div>
             <% end %>
           <% end %>

app/views/budgets/investments/_ballot.html.erb

@@ -43,10 +43,9 @@
   <% 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) %>
+      <% signin = link_to(t("users.signin"), new_user_session_path) %>
-      <% signup = link_to(t("votes.signup"), new_user_registration_path) %>
+      <% signup = link_to(t("users.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)) %>

app/views/budgets/investments/_votes.html.erb

@@ -34,8 +34,8 @@
           <%= 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),
+                signin: link_to(t("users.signin"), new_user_session_path),
-                signup: link_to(t("votes.signup"), new_user_registration_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)
                ).html_safe %>
         </small>

app/views/budgets/show.html.erb

@@ -30,8 +30,8 @@
         <% 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_in: link_to(t("users.signin"), new_user_session_path),
-                  sign_up: link_to(t("budgets.investments.index.sidebar.sign_up"), new_user_registration_path)).html_safe %>
+                  sign_up: link_to(t("users.signup"), new_user_registration_path)).html_safe %>
           </div>
         <% end %>
       <% end %>

app/views/debates/_votes.html.erb

@@ -59,9 +59,9 @@
   <% elsif !user_signed_in? %>
     <div tabindex="0">
       <div class="participation-not-allowed" style="display:none" aria-hidden="false">
-        <%= t("votes.unauthenticated",
+        <%= t("users.login_to_continue",
-          signin: link_to(t("votes.signin"), new_user_session_path),
+          signin: link_to(t("users.signin"), new_user_session_path),
-          signup: link_to(t("votes.signup"), new_user_registration_path)).html_safe %>
+          signup: link_to(t("users.signup"), new_user_registration_path)).html_safe %>
       </div>
     </div>
   <% end %>

app/views/direct_messages/new.html.erb

@@ -9,9 +9,9 @@
     <% if not current_user %>
       <div class="callout primary">
         <p>
-          <%= t("users.direct_messages.new.authenticate",
+          <%= t("users.login_to_continue",
-            signin: link_to(t("users.direct_messages.new.signin"), new_user_session_path),
+            signin: link_to(t("users.signin"), new_user_session_path),
-            signup: link_to(t("users.direct_messages.new.signup"), new_user_registration_path)).html_safe %>
+            signup: link_to(t("users.signup"), new_user_registration_path)).html_safe %>
         </p>
       </div>
     <% elsif not @receiver.email_on_direct_message? %>

app/views/legislation/processes/_help_gif.html.erb

@@ -12,8 +12,8 @@
         <% else %>
           <p>
             <%= t("annotator.help.text",
-                sign_in: link_to(t("annotator.help.text_sign_in"), new_user_session_path),
+                sign_in: link_to(t("users.signin"), new_user_session_path),
-                sign_up: link_to(t("annotator.help.text_sign_up"), new_user_registration_path)).html_safe %>
+                sign_up: link_to(t("users.signup"), new_user_registration_path)).html_safe %>
           </p>
         <% end %>
 

app/views/legislation/proposals/_featured_votes.html.erb

@@ -29,8 +29,8 @@
   <% 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),
+        signin: link_to(t("users.signin"), new_user_session_path),
-        signup: link_to(t("votes.signup"), new_user_registration_path)).html_safe %>
+        signup: link_to(t("users.signup"), new_user_registration_path)).html_safe %>
     </div>
   <% end %>
 

app/views/legislation/proposals/_votes.html.erb

@@ -61,9 +61,9 @@
   <% elsif !user_signed_in? %>
     <div tabindex="0">
       <div class="participation-not-allowed" style="display:none" aria-hidden="false">
-        <%= t("votes.unauthenticated",
+        <%= t("users.login_to_continue",
-          signin: link_to(t("votes.signin"), new_user_session_path),
+          signin: link_to(t("users.signin"), new_user_session_path),
-          signup: link_to(t("votes.signup"), new_user_registration_path)).html_safe %>
+          signup: link_to(t("users.signup"), new_user_registration_path)).html_safe %>
       </div>
     </div>
   <% end %>

app/views/legislation/questions/_participation_not_allowed.html.erb

@@ -14,8 +14,8 @@
 <% 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),
+      signin: link_to(t("users.signin"), new_user_session_path),
-      signup: link_to(t("legislation.questions.participation.signup"), new_user_registration_path)).html_safe %>
+      signup: link_to(t("users.signup"), new_user_registration_path)).html_safe %>
   </div>
 <% elsif !@process.debate_phase.open? %>
   <div class="participation-not-allowed" style="display:none" aria-hidden="false">

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"),
+            signin: link_to(t("users.signin"), new_user_session_path, class: "probe-message"),
-            signup: link_to(t("polls.show.signup"), new_user_registration_path, class: "probe-message")).html_safe %>
+            signup: link_to(t("users.signup"), new_user_registration_path, class: "probe-message")).html_safe %>
     </div>
   <% elsif current_user.unverified? %>
     <div class="callout warning">

app/views/proposals/_featured_votes.html.erb

@@ -28,9 +28,9 @@
     </div>
   <% elsif !user_signed_in? %>
     <div class="participation-not-allowed" style="display:none" aria-hidden="false">
-      <%= t("votes.unauthenticated",
+      <%= t("users.login_to_continue",
-        signin: link_to(t("votes.signin"), new_user_session_path),
+        signin: link_to(t("users.signin"), new_user_session_path),
-        signup: link_to(t("votes.signup"), new_user_registration_path)).html_safe %>
+        signup: link_to(t("users.signup"), new_user_registration_path)).html_safe %>
     </div>
   <% end %>
 

app/views/proposals/_votes.html.erb

@@ -37,9 +37,9 @@
   <% elsif !user_signed_in? %>
     <div tabindex="0">
       <div class="participation-not-allowed" style="display:none" aria-hidden="false">
-        <%= t("votes.unauthenticated",
+        <%= t("users.login_to_continue",
-          signin: link_to(t("votes.signin"), new_user_session_path),
+          signin: link_to(t("users.signin"), new_user_session_path),
-          signup: link_to(t("votes.signup"), new_user_registration_path)).html_safe %>
+          signup: link_to(t("users.signup"), new_user_registration_path)).html_safe %>
       </div>
     </div>
   <% end %>

app/views/topics/_informative_text.html.erb

@@ -7,7 +7,7 @@
 <% 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_in: link_to(t("users.signin"), new_user_session_path),
-          sign_up: link_to(t("community.show.create_first_community_topic.sign_up"), new_user_registration_path)).html_safe %>
+          sign_up: link_to(t("users.signup"), new_user_registration_path)).html_safe %>
   </div>
 <% end %>

config/locales/en/budgets.yml

@@ -98,8 +98,6 @@ en:
           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

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:

config/locales/en/general.yml

@@ -665,8 +665,6 @@ en:
       back: Back to voting
       cant_answer_not_logged_in: "You must %{signin} or %{signup} to participate."
       comments_tab: Comments
-      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."
@@ -859,8 +857,9 @@ en:
       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."
-    signin: Sign in
+    login_to_continue: "You must %{signin} or %{signup} to continue."
-    signup: Sign up
+    signin: "sign in"
+    signup: "sign up"
     direct_messages:
       new:
         body_label: Message
@@ -870,9 +869,6 @@ en:
         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:
@@ -921,7 +917,6 @@ en:
     disagree: I disagree
     organizations: Organizations are not permitted to vote
     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:
@@ -1002,8 +997,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:

config/locales/en/legislation.yml

@@ -113,8 +113,6 @@ 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

config/locales/es/budgets.yml

@@ -98,8 +98,6 @@ es:
           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

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:

config/locales/es/general.yml

@@ -663,8 +663,6 @@ es:
       back: Volver a votaciones
       cant_answer_not_logged_in: "Necesitas %{signin} o %{signup} para participar."
       comments_tab: Comentarios
-      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."
@@ -856,8 +854,9 @@ es:
       all: "No tienes permiso para realizar la acción '%{action}' sobre %{subject}."
   users:
     login_to_comment: "Necesitas %{signin} o %{signup} para comentar."
-    signin: iniciar sesión
+    login_to_continue: "Necesitas %{signin} o %{signup} para continuar."
-    signup: registrarte
+    signin: "iniciar sesión"
+    signup: "registrarte"
     direct_messages:
       new:
         body_label: Mensaje
@@ -867,9 +866,6 @@ es:
         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:
@@ -918,7 +914,6 @@ es:
     disagree: No estoy de acuerdo
     organizations: Las organizaciones no pueden votar.
     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:

config/locales/es/legislation.yml

@@ -112,8 +112,6 @@ 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

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

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"

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"

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"

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"

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"

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"

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"

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

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

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