Merge pull request #463 from alphagov/update-unsub-links-and-subject-lines-again

alanth · alanth · commit 6f20e64eab03 · 2016-05-12T05:47:18.000+01:00
Add petition actions to subject lines, make email unsubscribe information more specific
diff --git a/app/views/petition_mailer/email_creator.html.erb b/app/views/petition_mailer/email_creator.html.erb
@@ -1,10 +1,10 @@
-<p><small>You’re receiving this email because you created this petition.</small></p>
-<p><small>To unsubscribe: <%= link_to nil, unsubscribe_signature_url(@signature, @signature.unsubscribe_token) %></small></p>
+<p><small>You’re receiving this email because you created this petition: “<%= @petition.action %>”.</small></p>
+<p><small>To unsubscribe from this petition: <%= link_to nil, unsubscribe_signature_url(@signature, @signature.unsubscribe_token) %></small></p>
 <hr>
 
 <p>Dear <%= @signature.name %>,</p>
 
-<p>You recently created the petition "<%= @petition.action %>":<br />
+<p>You recently created the petition “<%= @petition.action %>”:<br />
 <%= link_to nil, petition_url(@petition) %></p>
 
 <%= auto_link(simple_format(h(@email.body))) %>
@@ -14,5 +14,5 @@
 <%= t("petitions.emails.signoff_suffix") %></p>
 
 <hr>
-<p><small>You’re receiving this email because you created this petition.</small></p>
-<p><small>To unsubscribe: <%= link_to nil, unsubscribe_signature_url(@signature, @signature.unsubscribe_token) %></small></p>
+<p><small>You’re receiving this email because you created this petition: “<%= @petition.action %>”.</small></p>
+<p><small>To unsubscribe from this petition: <%= link_to nil, unsubscribe_signature_url(@signature, @signature.unsubscribe_token) %></small></p>
diff --git a/app/views/petition_mailer/email_creator.text.erb b/app/views/petition_mailer/email_creator.text.erb
@@ -1,10 +1,10 @@
-You’re receiving this email because you created this petition.
-To unsubscribe: <%= unsubscribe_signature_url(@signature, @signature.unsubscribe_token) %>
+You’re receiving this email because you created this petition: “<%= @petition.action %>”.
+To unsubscribe from this petition: <%= unsubscribe_signature_url(@signature, @signature.unsubscribe_token) %>
 --
 
 Dear <%= @signature.name %>,
 
-You recently created the petition "<%= @petition.action %>":
+You recently created the petition “<%= @petition.action %>”:
 <%= petition_url(@petition) %>
 
 <%= @email.body %>
@@ -14,5 +14,5 @@ Thanks,
 <%= t("petitions.emails.signoff_suffix") %>
 
 --
-You’re receiving this email because you created this petition.
-To unsubscribe: <%= unsubscribe_signature_url(@signature, @signature.unsubscribe_token) %>
+You’re receiving this email because you created this petition: “<%= @petition.action %>”.
+To unsubscribe from this petition: <%= unsubscribe_signature_url(@signature, @signature.unsubscribe_token) %>
diff --git a/app/views/petition_mailer/email_signer.html.erb b/app/views/petition_mailer/email_signer.html.erb
@@ -1,10 +1,10 @@
-<p><small>You’re receiving this email because you signed this petition.</small></p>
-<p><small>To unsubscribe: <%= link_to nil, unsubscribe_signature_url(@signature, @signature.unsubscribe_token) %></small></p>
+<p><small>You’re receiving this email because you signed this petition: “<%= @petition.action %>”.</small></p>
+<p><small>To unsubscribe from this petition: <%= link_to nil, unsubscribe_signature_url(@signature, @signature.unsubscribe_token) %></small></p>
 <hr>
 
 <p>Dear <%= @signature.name %>,</p>
 
-<p>You recently signed the petition "<%= @petition.action %>":<br />
+<p>You recently signed the petition “<%= @petition.action %>”:<br />
 <%= link_to nil, petition_url(@petition) %></p>
 
 <%= auto_link(simple_format(h(@email.body))) %>
@@ -14,5 +14,5 @@
 <%= t("petitions.emails.signoff_suffix") %></p>
 
 <hr>
-<p><small>You’re receiving this email because you signed this petition.</small></p>
-<p><small>To unsubscribe: <%= link_to nil, unsubscribe_signature_url(@signature, @signature.unsubscribe_token) %></small></p>
+<p><small>You’re receiving this email because you signed this petition: “<%= @petition.action %>”.</small></p>
+<p><small>To unsubscribe from this petition: <%= link_to nil, unsubscribe_signature_url(@signature, @signature.unsubscribe_token) %></small></p>
diff --git a/app/views/petition_mailer/email_signer.text.erb b/app/views/petition_mailer/email_signer.text.erb
@@ -1,10 +1,10 @@
-You’re receiving this email because you signed this petition.
-To unsubscribe: <%= unsubscribe_signature_url(@signature, @signature.unsubscribe_token) %>
+You’re receiving this email because you signed this petition: “<%= @petition.action %>”.
+To unsubscribe from this petition: <%= unsubscribe_signature_url(@signature, @signature.unsubscribe_token) %>
 --
 
 Dear <%= @signature.name %>,
 
-You recently signed the petition "<%= @petition.action %>":
+You recently signed the petition “<%= @petition.action %>”:
 <%= petition_url(@petition) %>
 
 <%= @email.body %>
@@ -14,5 +14,5 @@ Thanks,
 <%= t("petitions.emails.signoff_suffix") %>
 
 --
-You’re receiving this email because you signed this petition.
-To unsubscribe: <%= unsubscribe_signature_url(@signature, @signature.unsubscribe_token) %>
+You’re receiving this email because you signed this petition: “<%= @petition.action %>”.
+To unsubscribe from this petition: <%= unsubscribe_signature_url(@signature, @signature.unsubscribe_token) %>
diff --git a/app/views/petition_mailer/notify_creator_of_debate_outcome.html.erb b/app/views/petition_mailer/notify_creator_of_debate_outcome.html.erb
@@ -1,5 +1,5 @@
-<p><small>You’re receiving this email because you created this petition.</small></p>
-<p><small>To unsubscribe: <%= link_to nil, unsubscribe_signature_url(@signature, @signature.unsubscribe_token) %></small></p>
+<p><small>You’re receiving this email because you created this petition: “<%= @petition.action %>”.</small></p>
+<p><small>To unsubscribe from this petition: <%= link_to nil, unsubscribe_signature_url(@signature, @signature.unsubscribe_token) %></small></p>
 <hr>
 
 <p>Dear <%= @signature.name %>,</p>
@@ -37,5 +37,5 @@
 <%= t("petitions.emails.signoff_suffix") %></p>
 
 <hr>
-<p><small>You’re receiving this email because you created this petition.</small></p>
-<p><small>To unsubscribe: <%= link_to nil, unsubscribe_signature_url(@signature, @signature.unsubscribe_token) %></small></p>
+<p><small>You’re receiving this email because you created this petition: “<%= @petition.action %>”.</small></p>
+<p><small>To unsubscribe from this petition: <%= link_to nil, unsubscribe_signature_url(@signature, @signature.unsubscribe_token) %></small></p>
diff --git a/app/views/petition_mailer/notify_creator_of_debate_outcome.text.erb b/app/views/petition_mailer/notify_creator_of_debate_outcome.text.erb
@@ -1,11 +1,11 @@
-You’re receiving this email because you created this petition.
-To unsubscribe: <%= unsubscribe_signature_url(@signature, @signature.unsubscribe_token) %>
+You’re receiving this email because you created this petition: “<%= @petition.action %>”.
+To unsubscribe from this petition: <%= unsubscribe_signature_url(@signature, @signature.unsubscribe_token) %>
 --
 
 Dear <%= @signature.name %>,
 
 <% if @debate_outcome.debated? %>
-Parliament debated your petition – "<%= @petition.action %>"
+Parliament debated your petition – “<%= @petition.action %>”
 
 <% if @debate_outcome.overview? %>
 <%= @debate_outcome.overview %>
@@ -38,5 +38,5 @@ Thanks,
 <%= t("petitions.emails.signoff_suffix") %>
 
 --
-You’re receiving this email because you created this petition.
-To unsubscribe: <%= unsubscribe_signature_url(@signature, @signature.unsubscribe_token) %>
+You’re receiving this email because you created this petition: “<%= @petition.action %>”.
+To unsubscribe from this petition: <%= unsubscribe_signature_url(@signature, @signature.unsubscribe_token) %>
diff --git a/app/views/petition_mailer/notify_creator_of_debate_scheduled.html.erb b/app/views/petition_mailer/notify_creator_of_debate_scheduled.html.erb
@@ -1,5 +1,5 @@
-<p><small>You’re receiving this email because you created this petition.</small></p>
-<p><small>To unsubscribe: <%= link_to nil, unsubscribe_signature_url(@signature, @signature.unsubscribe_token) %></small></p>
+<p><small>You’re receiving this email because you created this petition: “<%= @petition.action %>”.</small></p>
+<p><small>To unsubscribe from this petition: <%= link_to nil, unsubscribe_signature_url(@signature, @signature.unsubscribe_token) %></small></p>
 <hr>
 
 <p>Dear <%= @signature.name %>,</p>
@@ -17,5 +17,5 @@
 <%= t("petitions.emails.signoff_suffix") %></p>
 
 <hr>
-<p><small>You’re receiving this email because you created this petition.</small></p>
-<p><small>To unsubscribe: <%= link_to nil, unsubscribe_signature_url(@signature, @signature.unsubscribe_token) %></small></p>
+<p><small>You’re receiving this email because you created this petition: “<%= @petition.action %>”.</small></p>
+<p><small>To unsubscribe from this petition: <%= link_to nil, unsubscribe_signature_url(@signature, @signature.unsubscribe_token) %></small></p>
diff --git a/app/views/petition_mailer/notify_creator_of_debate_scheduled.text.erb b/app/views/petition_mailer/notify_creator_of_debate_scheduled.text.erb
@@ -1,10 +1,10 @@
-You’re receiving this email because you created this petition.
-To unsubscribe: <%= unsubscribe_signature_url(@signature, @signature.unsubscribe_token) %>
+You’re receiving this email because you created this petition: “<%= @petition.action %>”.
+To unsubscribe from this petition: <%= unsubscribe_signature_url(@signature, @signature.unsubscribe_token) %>
 --
 
 Dear <%= @signature.name %>,
 
-Parliament is going to debate your petition – "<%= @petition.action %>".
+Parliament is going to debate your petition – “<%= @petition.action %>”.
 
 <%= petition_url(@petition) %>
 
@@ -17,5 +17,5 @@ Thanks,
 <%= t("petitions.emails.signoff_suffix") %>
 
 --
-You’re receiving this email because you created this petition.
-To unsubscribe: <%= unsubscribe_signature_url(@signature, @signature.unsubscribe_token) %>
+You’re receiving this email because you created this petition: “<%= @petition.action %>”.
+To unsubscribe from this petition: <%= unsubscribe_signature_url(@signature, @signature.unsubscribe_token) %>
diff --git a/app/views/petition_mailer/notify_creator_of_threshold_response.html.erb b/app/views/petition_mailer/notify_creator_of_threshold_response.html.erb
@@ -1,5 +1,5 @@
-<p><small>You’re receiving this email because you created this petition.</small></p>
-<p><small>To unsubscribe: <%= link_to nil, unsubscribe_signature_url(@signature, @signature.unsubscribe_token) %></small></p>
+<p><small>You’re receiving this email because you created this petition: “<%= @petition.action %>”.</small></p>
+<p><small>To unsubscribe from this petition: <%= link_to nil, unsubscribe_signature_url(@signature, @signature.unsubscribe_token) %></small></p>
 <hr>
 
 <p>Dear <%= @signature.name %>,</p>
@@ -29,5 +29,5 @@
 <%= t("petitions.emails.signoff_suffix") %></p>
 
 <hr>
-<p><small>You’re receiving this email because you created this petition.</small></p>
-<p><small>To unsubscribe: <%= link_to nil, unsubscribe_signature_url(@signature, @signature.unsubscribe_token) %></small></p>
+<p><small>You’re receiving this email because you created this petition: “<%= @petition.action %>”.</small></p>
+<p><small>To unsubscribe from this petition: <%= link_to nil, unsubscribe_signature_url(@signature, @signature.unsubscribe_token) %></small></p>
diff --git a/app/views/petition_mailer/notify_creator_of_threshold_response.text.erb b/app/views/petition_mailer/notify_creator_of_threshold_response.text.erb
@@ -1,10 +1,10 @@
-You’re receiving this email because you created this petition.
-To unsubscribe: <%= unsubscribe_signature_url(@signature, @signature.unsubscribe_token) %>
+You’re receiving this email because you created this petition: “<%= @petition.action %>”.
+To unsubscribe from this petition: <%= unsubscribe_signature_url(@signature, @signature.unsubscribe_token) %>
 --
 
 Dear <%= @signature.name %>,
 
-The Government has responded to your petition – "<%= @petition.action %>".
+The Government has responded to your petition – “<%= @petition.action %>”.
 
 Government responded:
 
@@ -29,5 +29,5 @@ Thanks,
 <%= t("petitions.emails.signoff_suffix") %>
 
 --
-You’re receiving this email because you created this petition.
-To unsubscribe: <%= unsubscribe_signature_url(@signature, @signature.unsubscribe_token) %>
+You’re receiving this email because you created this petition: “<%= @petition.action %>”.
+To unsubscribe from this petition: <%= unsubscribe_signature_url(@signature, @signature.unsubscribe_token) %>
diff --git a/app/views/petition_mailer/notify_creator_that_petition_is_published.text.erb b/app/views/petition_mailer/notify_creator_that_petition_is_published.text.erb
@@ -1,6 +1,6 @@
 Dear <%= @signature.name %>,
 
-We published the petition you created – "<%= @petition.action %>".
+We published the petition you created – “<%= @petition.action %>”.
 
 Click this link to see your petition and start sharing it:
 <%= petition_url(@petition) %>
diff --git a/app/views/petition_mailer/notify_signer_of_debate_outcome.html.erb b/app/views/petition_mailer/notify_signer_of_debate_outcome.html.erb
@@ -1,5 +1,5 @@
-<p><small>You’re receiving this email because you signed this petition.</small></p>
-<p><small>To unsubscribe: <%= link_to nil, unsubscribe_signature_url(@signature, @signature.unsubscribe_token) %></small></p>
+<p><small>You’re receiving this email because you signed this petition: “<%= @petition.action %>”.</small></p>
+<p><small>To unsubscribe from this petition: <%= link_to nil, unsubscribe_signature_url(@signature, @signature.unsubscribe_token) %></small></p>
 <hr>
 
 <p>Dear <%= @signature.name %>,</p>
@@ -37,5 +37,5 @@
 <%= t("petitions.emails.signoff_suffix") %></p>
 
 <hr>
-<p><small>You’re receiving this email because you signed this petition.</small></p>
-<p><small>To unsubscribe: <%= link_to nil, unsubscribe_signature_url(@signature, @signature.unsubscribe_token) %></small></p>
+<p><small>You’re receiving this email because you signed this petition: “<%= @petition.action %>”.</small></p>
+<p><small>To unsubscribe from this petition: <%= link_to nil, unsubscribe_signature_url(@signature, @signature.unsubscribe_token) %></small></p>
diff --git a/app/views/petition_mailer/notify_signer_of_debate_outcome.text.erb b/app/views/petition_mailer/notify_signer_of_debate_outcome.text.erb
@@ -1,11 +1,11 @@
-You’re receiving this email because you signed this petition.
-To unsubscribe: <%= unsubscribe_signature_url(@signature, @signature.unsubscribe_token) %>
+You’re receiving this email because you signed this petition: “<%= @petition.action %>”.
+To unsubscribe from this petition: <%= unsubscribe_signature_url(@signature, @signature.unsubscribe_token) %>
 --
 
 Dear <%= @signature.name %>,
 
 <% if @debate_outcome.debated? %>
-Parliament debated the petition you signed – "<%= @petition.action %>"
+Parliament debated the petition you signed – “<%= @petition.action %>”
 
 <% if @debate_outcome.overview? %>
 <%= @debate_outcome.overview %>
@@ -22,7 +22,7 @@ Read the transcript: <%= @debate_outcome.transcript_url %>
 The petition: <%= petition_url(@petition) %>
 
 <% else %>
-The Petitions Committee decided not to debate the petition you signed – "<%= @petition.action %>"
+The Petitions Committee decided not to debate the petition you signed – “<%= @petition.action %>”
 
 <% if @debate_outcome.overview? %>
 <%= @debate_outcome.overview %>
@@ -38,5 +38,5 @@ Thanks,
 <%= t("petitions.emails.signoff_suffix") %>
 
 --
-You’re receiving this email because you signed this petition.
-To unsubscribe: <%= unsubscribe_signature_url(@signature, @signature.unsubscribe_token) %>
+You’re receiving this email because you signed this petition: “<%= @petition.action %>”.
+To unsubscribe from this petition: <%= unsubscribe_signature_url(@signature, @signature.unsubscribe_token) %>
diff --git a/app/views/petition_mailer/notify_signer_of_debate_scheduled.html.erb b/app/views/petition_mailer/notify_signer_of_debate_scheduled.html.erb
@@ -1,5 +1,5 @@
-<p><small>You’re receiving this email because you signed this petition.</small></p>
-<p><small>To unsubscribe: <%= link_to nil, unsubscribe_signature_url(@signature, @signature.unsubscribe_token) %></small></p>
+<p><small>You’re receiving this email because you signed this petition: “<%= @petition.action %>”.</small></p>
+<p><small>To unsubscribe from this petition: <%= link_to nil, unsubscribe_signature_url(@signature, @signature.unsubscribe_token) %></small></p>
 <hr>
 
 <p>Dear <%= @signature.name %>,</p>
@@ -17,5 +17,5 @@
 <%= t("petitions.emails.signoff_suffix") %></p>
 
 <hr>
-<p><small>You’re receiving this email because you signed this petition.</small></p>
-<p><small>To unsubscribe: <%= link_to nil, unsubscribe_signature_url(@signature, @signature.unsubscribe_token) %></small></p>
+<p><small>You’re receiving this email because you signed this petition: “<%= @petition.action %>”.</small></p>
+<p><small>To unsubscribe from this petition: <%= link_to nil, unsubscribe_signature_url(@signature, @signature.unsubscribe_token) %></small></p>
diff --git a/app/views/petition_mailer/notify_signer_of_debate_scheduled.text.erb b/app/views/petition_mailer/notify_signer_of_debate_scheduled.text.erb
@@ -1,10 +1,10 @@
-You’re receiving this email because you signed this petition.
-To unsubscribe: <%= unsubscribe_signature_url(@signature, @signature.unsubscribe_token) %>
+You’re receiving this email because you signed this petition: “<%= @petition.action %>”.
+To unsubscribe from this petition: <%= unsubscribe_signature_url(@signature, @signature.unsubscribe_token) %>
 --
 
 Dear <%= @signature.name %>,
 
-Parliament is going to debate the petition you signed – "<%= @petition.action %>".
+Parliament is going to debate the petition you signed – “<%= @petition.action %>”.
 
 <%= petition_url(@petition) %>
 
@@ -17,5 +17,5 @@ Thanks,
 <%= t("petitions.emails.signoff_suffix") %>
 
 --
-You’re receiving this email because you signed this petition.
-To unsubscribe: <%= unsubscribe_signature_url(@signature, @signature.unsubscribe_token) %>
+You’re receiving this email because you signed this petition: “<%= @petition.action %>”.
+To unsubscribe from this petition: <%= unsubscribe_signature_url(@signature, @signature.unsubscribe_token) %>
diff --git a/app/views/petition_mailer/notify_signer_of_threshold_response.html.erb b/app/views/petition_mailer/notify_signer_of_threshold_response.html.erb
@@ -1,5 +1,5 @@
-<p><small>You’re receiving this email because you signed this petition.</small></p>
-<p><small>To unsubscribe: <%= link_to nil, unsubscribe_signature_url(@signature, @signature.unsubscribe_token) %></small></p>
+<p><small>You’re receiving this email because you signed this petition: “<%= @petition.action %>”.</small></p>
+<p><small>To unsubscribe from this petition: <%= link_to nil, unsubscribe_signature_url(@signature, @signature.unsubscribe_token) %></small></p>
 <hr>
 
 <p>Dear <%= @signature.name %>,</p>
@@ -29,5 +29,5 @@
 <%= t("petitions.emails.signoff_suffix") %></p>
 
 <hr>
-<p><small>You’re receiving this email because you signed this petition.</small></p>
-<p><small>To unsubscribe: <%= link_to nil, unsubscribe_signature_url(@signature, @signature.unsubscribe_token) %></small></p>
+<p><small>You’re receiving this email because you signed this petition: “<%= @petition.action %>”.</small></p>
+<p><small>To unsubscribe from this petition: <%= link_to nil, unsubscribe_signature_url(@signature, @signature.unsubscribe_token) %></small></p>
diff --git a/app/views/petition_mailer/notify_signer_of_threshold_response.text.erb b/app/views/petition_mailer/notify_signer_of_threshold_response.text.erb
@@ -1,10 +1,10 @@
-You’re receiving this email because you signed this petition.
-To unsubscribe: <%= unsubscribe_signature_url(@signature, @signature.unsubscribe_token) %>
+You’re receiving this email because you signed this petition: “<%= @petition.action %>”.
+To unsubscribe from this petition: <%= unsubscribe_signature_url(@signature, @signature.unsubscribe_token) %>
 --
 
 Dear <%= @signature.name %>,
 
-The Government has responded to the petition you signed – "<%= @petition.action %>".
+The Government has responded to the petition you signed – “<%= @petition.action %>”.
 
 Government responded:
 
@@ -29,5 +29,5 @@ Thanks,
 <%= t("petitions.emails.signoff_suffix") %>
 
 --
-You’re receiving this email because you signed this petition.
-To unsubscribe: <%= unsubscribe_signature_url(@signature, @signature.unsubscribe_token) %>
+You’re receiving this email because you signed this petition: “<%= @petition.action %>”.
+To unsubscribe from this petition: <%= unsubscribe_signature_url(@signature, @signature.unsubscribe_token) %>
diff --git a/app/views/petition_mailer/notify_sponsor_that_petition_is_published.text.erb b/app/views/petition_mailer/notify_sponsor_that_petition_is_published.text.erb
@@ -1,6 +1,6 @@
 Dear <%= @signature.name %>,
 
-We published the petition you supported – "<%= @petition.action %>".
+We published the petition you supported – “<%= @petition.action %>”.
 
 Click this link to see the petition and start sharing it:
 <%= petition_url(@petition) %>
diff --git a/app/views/signatures/unsubscribe.html.erb b/app/views/signatures/unsubscribe.html.erb
@@ -1,12 +1,12 @@
 <% if @signature.already_unsubscribed? %>
-  <h1>Already unsubscribed</h1>
-  <p>You have already unsubscribed from future email updates on this petition.</p>
+  <h1>Already unsubscribed from this petition</h1>
+  <p>You have already unsubscribed from email updates about this petition.</p>
 <% elsif @signature.invalid_unsubscribe_token? %>
   <h1>Failed to unsubscribe</h1>
-  <p>Failed to unsubscribe. Your unsubscription token is invalid.</p>
+  <p>Your unsubscribe link is invalid.</p>
 <% else %>
-  <h1>Successfully unsubscribed</h1>
-  <p>You have now unsubscribed from future email updates on this petition.</p>
+  <h1>Successfully unsubscribed from this petition</h1>
+  <p>You have unsubscribed from email updates about this petition.</p>
 <% end %>
 
 <%= link_to "Return to home page", home_path %>
diff --git a/config/locales/petitions.en-GB.yml b/config/locales/petitions.en-GB.yml
diff --git a/spec/controllers/admin/government_response_controller_spec.rb b/spec/controllers/admin/government_response_controller_spec.rb
diff --git a/spec/controllers/admin/moderation_controller_spec.rb b/spec/controllers/admin/moderation_controller_spec.rb
diff --git a/spec/mailers/petition_mailer_spec.rb b/spec/mailers/petition_mailer_spec.rb
