diff --git a/config/locales/en/general.yml b/config/locales/en/general.yml index 94cd6bd3b..47f752f83 100644 --- a/config/locales/en/general.yml +++ b/config/locales/en/general.yml @@ -523,7 +523,7 @@ en: comments: Comments latest_comments: Latest messages messages: - send_notification: Send message to proposal followers + send_notification: Send notification to proposal followers previous_notifications: See previous notifications polls: index: @@ -658,9 +658,9 @@ en: voted: "You have voted %{answer}" proposal_notifications: new: - title: "Send message" - submit_button: "Send message" - info_about_receivers: "This message will be sent to %{count} people and it will be visible in %{proposal_page}.
Messages are not sent immediately, users will receive periodically an email with all proposal notifications." + title: "Send notification" + submit_button: "Send notification" + info_about_receivers: "This notification will be sent to %{count} people and it will be visible in %{proposal_page}.
Notifications are not sent immediately, users will periodically receive an email with all proposal notifications." proposal_page: "the proposal's page" show: back: "Go back to my content" diff --git a/config/locales/es/general.yml b/config/locales/es/general.yml index b6b1a1395..af99033e5 100644 --- a/config/locales/es/general.yml +++ b/config/locales/es/general.yml @@ -523,7 +523,7 @@ es: comments: Comentarios latest_comments: Últimos mensajes messages: - send_notification: Enviar mensaje a los que siguen la propuesta + send_notification: Enviar notificación a los que siguen la propuesta previous_notifications: Ver notificaciones anteriores polls: index: @@ -658,9 +658,9 @@ es: voted: "Has votado %{answer}" proposal_notifications: new: - title: "Enviar mensaje" - submit_button: "Enviar mensaje" - info_about_receivers: "Este mensaje se enviará a %{count} usuarios y se publicará en %{proposal_page}.
El mensaje no se enviará inmediatamente, los usuarios recibirán periódicamente un email con todas las notificaciones de propuestas." + title: "Enviar notificación" + submit_button: "Enviar notificación" + info_about_receivers: "Esta notificación se enviará a %{count} usuarios y se publicará en %{proposal_page}.
Las notificaciones no se enviarán inmediatamente, los usuarios recibirán periódicamente un email con todas las notificaciones de propuestas." proposal_page: "la página de la propuesta" show: back: "Volver a mi contenido" diff --git a/spec/support/common_actions/notifications.rb b/spec/support/common_actions/notifications.rb index 572a4d3c8..38ca96502 100644 --- a/spec/support/common_actions/notifications.rb +++ b/spec/support/common_actions/notifications.rb @@ -39,11 +39,11 @@ module Notifications click_link "Message to users" end - click_link "Send message to proposal followers" + click_link "Send notification to proposal followers" fill_in "proposal_notification_title", with: "Thanks for supporting proposal: #{proposal.title}" fill_in "proposal_notification_body", with: "Please share it with others! #{proposal.summary}" - click_button "Send message" + click_button "Send notification" expect(page).to have_content "Your message has been sent correctly." Notification.last diff --git a/spec/system/dashboard/dashboard_spec.rb b/spec/system/dashboard/dashboard_spec.rb index a7c132ea3..2485a4572 100644 --- a/spec/system/dashboard/dashboard_spec.rb +++ b/spec/system/dashboard/dashboard_spec.rb @@ -356,13 +356,13 @@ describe "Proposal's dashboard" do click_link "Message to users" end - expect(page).to have_link("Send message to proposal followers") + expect(page).to have_link("Send notification to proposal followers") expect(page).to have_link("See previous notifications") end scenario "Dashboard has a link to send message to proposal supporters" do visit messages_proposal_dashboard_path(proposal) - click_link("Send message to proposal followers") + click_link("Send notification to proposal followers") fill_in "Title", with: "Thank you for supporting my proposal" fill_in "Message", with: "Please share it with others!" diff --git a/spec/system/proposal_notifications_spec.rb b/spec/system/proposal_notifications_spec.rb index b4e49fb30..d38214978 100644 --- a/spec/system/proposal_notifications_spec.rb +++ b/spec/system/proposal_notifications_spec.rb @@ -14,7 +14,7 @@ describe "Proposal Notifications" do click_link "Message to users" end - click_link "Send message to proposal followers" + click_link "Send notification to proposal followers" fill_in "proposal_notification_title", with: "Thank you for supporting my proposal" fill_in "proposal_notification_body", with: "Please share it with "\ @@ -104,7 +104,7 @@ describe "Proposal Notifications" do login_as(author) visit new_proposal_notification_path(proposal_id: proposal.id) - expect(page).to have_content "This message will be sent to 7 people and it will "\ + expect(page).to have_content "This notification will be sent to 7 people and it will "\ "be visible in the proposal's page" expect(page).to have_link("the proposal's page", href: proposal_path(proposal, anchor: "comments")) @@ -120,7 +120,7 @@ describe "Proposal Notifications" do login_as(author) visit new_proposal_notification_path(proposal_id: proposal.id) - expect(page).to have_content "This message will be sent to 7 people and it will "\ + expect(page).to have_content "This notification will be sent to 7 people and it will "\ "be visible in the proposal's page" expect(page).to have_link("the proposal's page", href: proposal_path(proposal, anchor: "comments")) @@ -135,7 +135,7 @@ describe "Proposal Notifications" do login_as(author) visit new_proposal_notification_path(proposal_id: proposal.id) - expect(page).to have_content "This message will be sent to 1 people and it will "\ + expect(page).to have_content "This notification will be sent to 1 people and it will "\ "be visible in the proposal's page" expect(page).to have_link("the proposal's page", href: proposal_path(proposal, anchor: "comments")) @@ -159,7 +159,7 @@ describe "Proposal Notifications" do click_link "Message to users" end - expect(page).to have_link "Send message to proposal followers" + expect(page).to have_link "Send notification to proposal followers" end scenario "Accessing form directly" do