From 7bd1f15f37c2fd235f19ecf08cc8bb0eeeddcb45 Mon Sep 17 00:00:00 2001 From: taitus Date: Wed, 19 Jan 2022 15:02:41 +0100 Subject: [PATCH] Improve translation for the notification of comments Currently the translation: "Notify me by email when someone comments on my proposals or debates" It only refers to proposals and debates, but actually it also refers to budget investments, topics and polls. --- config/locales/en/activerecord.yml | 2 +- config/locales/es/activerecord.yml | 2 +- .../subscriptions/edit_component_spec.rb | 3 +-- spec/system/emails_spec.rb | 15 +++++---------- spec/system/subscriptions_spec.rb | 5 ++--- 5 files changed, 10 insertions(+), 17 deletions(-) diff --git a/config/locales/en/activerecord.yml b/config/locales/en/activerecord.yml index ce7e4f199..973455a05 100644 --- a/config/locales/en/activerecord.yml +++ b/config/locales/en/activerecord.yml @@ -272,7 +272,7 @@ en: password: "Password" current_password: "Current password" email_digest: "Receive a summary of proposal notifications" - email_on_comment: "Notify me by email when someone comments on my proposals or debates" + email_on_comment: "Notify me by email when someone comments on my contents" email_on_comment_reply: "Notify me by email when someone replies to my comments" email_on_direct_message: "Receive emails about direct messages" newsletter: "Receive by email website relevant information" diff --git a/config/locales/es/activerecord.yml b/config/locales/es/activerecord.yml index 74d03742a..82c682edf 100644 --- a/config/locales/es/activerecord.yml +++ b/config/locales/es/activerecord.yml @@ -272,7 +272,7 @@ es: password: "Contraseña" current_password: "Contraseña actual" email_digest: "Recibir resumen de notificaciones sobre propuestas" - email_on_comment: "Recibir un email cuando alguien comenta en mis propuestas o debates" + email_on_comment: "Recibir un email cuando alguien comenta en mis contenidos" email_on_comment_reply: "Recibir un email cuando alguien contesta a mis comentarios" email_on_direct_message: "Recibir emails con mensajes privados" newsletter: "Recibir emails con información interesante sobre la web" diff --git a/spec/components/subscriptions/edit_component_spec.rb b/spec/components/subscriptions/edit_component_spec.rb index 060407d16..4e8fa6323 100644 --- a/spec/components/subscriptions/edit_component_spec.rb +++ b/spec/components/subscriptions/edit_component_spec.rb @@ -8,8 +8,7 @@ describe Subscriptions::EditComponent do render_inline component expect(page).to have_content "Notifications" - expect(page).to have_field "Notify me by email when someone comments on my proposals or debates", - type: :checkbox + expect(page).to have_field "Notify me by email when someone comments on my contents", type: :checkbox expect(page).to have_field "Notify me by email when someone replies to my comments", type: :checkbox expect(page).to have_field "Receive by email website relevant information", type: :checkbox expect(page).to have_field "Receive a summary of proposal notifications", type: :checkbox diff --git a/spec/system/emails_spec.rb b/spec/system/emails_spec.rb index a8de896d0..57db5c376 100644 --- a/spec/system/emails_spec.rb +++ b/spec/system/emails_spec.rb @@ -52,8 +52,7 @@ describe "Emails" do expect(email).to have_body_text(proposal_path(proposal)) expect(email).to have_body_text("To unsubscribe from these emails, visit") expect(email).to have_body_text(edit_subscriptions_path(token: proposal.author.subscriptions_token)) - expect(email).to have_body_text( - 'and uncheck "Notify me by email when someone comments on my proposals or debates"') + expect(email).to have_body_text('and uncheck "Notify me by email when someone comments on my contents"') end scenario "Do not send email about own proposal comments" do @@ -81,8 +80,7 @@ describe "Emails" do expect(email).to have_body_text(debate_path(debate)) expect(email).to have_body_text("To unsubscribe from these emails, visit") expect(email).to have_body_text(edit_subscriptions_path(token: debate.author.subscriptions_token)) - expect(email).to have_body_text( - 'and uncheck "Notify me by email when someone comments on my proposals or debates"') + expect(email).to have_body_text('and uncheck "Notify me by email when someone comments on my contents"') end scenario "Do not send email about own debate comments" do @@ -110,8 +108,7 @@ describe "Emails" do expect(email).to have_body_text(budget_investment_path(investment, budget_id: investment.budget_id)) expect(email).to have_body_text("To unsubscribe from these emails, visit") expect(email).to have_body_text(edit_subscriptions_path(token: investment.author.subscriptions_token)) - expect(email).to have_body_text( - 'and uncheck "Notify me by email when someone comments on my proposals or debates"') + expect(email).to have_body_text('and uncheck "Notify me by email when someone comments on my contents"') end scenario "Do not send email about own budget investments comments" do @@ -140,8 +137,7 @@ describe "Emails" do expect(email).to have_body_text(community_topic_path(topic, community_id: topic.community_id)) expect(email).to have_body_text("To unsubscribe from these emails, visit") expect(email).to have_body_text(edit_subscriptions_path(token: topic.author.subscriptions_token)) - expect(email).to have_body_text( - 'and uncheck "Notify me by email when someone comments on my proposals or debates"') + expect(email).to have_body_text('and uncheck "Notify me by email when someone comments on my contents"') end scenario "Do not send email about own topic comments" do @@ -169,8 +165,7 @@ describe "Emails" do expect(email).to have_body_text(poll_path(poll)) expect(email).to have_body_text("To unsubscribe from these emails, visit") expect(email).to have_body_text(edit_subscriptions_path(token: poll.author.subscriptions_token)) - expect(email).to have_body_text( - 'and uncheck "Notify me by email when someone comments on my proposals or debates"') + expect(email).to have_body_text('and uncheck "Notify me by email when someone comments on my contents"') end scenario "Do not send email about own poll comments" do diff --git a/spec/system/subscriptions_spec.rb b/spec/system/subscriptions_spec.rb index 39cda642a..8cc6b7244 100644 --- a/spec/system/subscriptions_spec.rb +++ b/spec/system/subscriptions_spec.rb @@ -9,8 +9,7 @@ describe "Subscriptions" do visit edit_subscriptions_path(token: user.subscriptions_token) expect(page).to have_content "Notificaciones" - expect(page).to have_field "Recibir un email cuando alguien comenta en mis propuestas o debates", - type: :checkbox + expect(page).to have_field "Recibir un email cuando alguien comenta en mis contenidos", type: :checkbox expect(page).to have_field "Recibir un email cuando alguien contesta a mis comentarios", type: :checkbox expect(page).to have_field "Recibir emails con información interesante sobre la web", type: :checkbox expect(page).to have_field "Recibir resumen de notificaciones sobre propuestas", type: :checkbox @@ -34,7 +33,7 @@ describe "Subscriptions" do email_on_direct_message: true) visit edit_subscriptions_path(token: user.subscriptions_token) - check "Notify me by email when someone comments on my proposals or debates" + check "Notify me by email when someone comments on my contents" uncheck "Notify me by email when someone replies to my comments" uncheck "Receive by email website relevant information" check "Receive a summary of proposal notifications"