14 files changed, 175 insertions, 1 deletions
diff --git a/templates/email/default/alert-problem-area.txt b/templates/email/default/alert-problem-area.txt
new file mode 100644
index 000000000..8c41aaf5e
--- /dev/null
+++ b/templates/email/default/alert-problem-area.txt
@@ -0,0 +1,13 @@
+Subject: New problems in <?=$values['area_name']?> on FixMyStreet
+
+The following new problems have been added within
+<?=$values['area_name']?>:
+
+<?=$values['data']?>
+
+Yours,  
+The FixMyStreet team
+
+To stop receiving emails when there are new problems in
+<?=$values['area_name']?>, please follow this link: 
+<?=$values['unsubscribe_url']?>
diff --git a/templates/email/default/alert-problem-council.txt b/templates/email/default/alert-problem-council.txt
new file mode 100644
index 000000000..572e057a6
--- /dev/null
+++ b/templates/email/default/alert-problem-council.txt
@@ -0,0 +1,12 @@
+Subject: New problems reported to <?=$values['area_name']?> on FixMyStreet
+
+The following new problems have been reported to <?=$values['area_name']?>:
+
+<?=$values['data']?>
+
+Yours,  
+The FixMyStreet team
+
+To stop receiving emails when there are new problems reported to
+<?=$values['area_name']?>, please follow this link: 
+<?=$values['unsubscribe_url']?>
diff --git a/templates/email/default/alert-problem-nearby.txt b/templates/email/default/alert-problem-nearby.txt
new file mode 100644
index 000000000..0bf8483a7
--- /dev/null
+++ b/templates/email/default/alert-problem-nearby.txt
@@ -0,0 +1,11 @@
+Subject: New nearby problems on FixMyStreet
+
+The following nearby problems have been added:
+
+<?=$values['data']?>
+
+Yours,  
+The FixMyStreet team
+
+To stop receiving emails when there are nearby problems,
+please follow this link: <?=$values['unsubscribe_url']?>
diff --git a/templates/email/default/alert-problem-ward.txt b/templates/email/default/alert-problem-ward.txt
new file mode 100644
index 000000000..efcf15993
--- /dev/null
+++ b/templates/email/default/alert-problem-ward.txt
@@ -0,0 +1,13 @@
+Subject: New problems reported to <?=$values['area_name']?> within <?=$values['ward_name']?> on FixMyStreet
+
+The following new problems have been reported to <?=$values['area_name']?>
+within <?=$values['ward_name']?>:
+
+<?=$values['data']?>
+
+Yours,  
+The FixMyStreet team
+
+To stop receiving emails when there are new problems reported to
+<?=$values['area_name']?> within <?=$values['ward_name']?>,
+please follow this link: <?=$values['unsubscribe_url']?>
diff --git a/templates/email/default/alert-problem.txt b/templates/email/default/alert-problem.txt
new file mode 100644
index 000000000..8369b8e28
--- /dev/null
+++ b/templates/email/default/alert-problem.txt
@@ -0,0 +1,11 @@
+Subject: New problems on FixMyStreet
+
+The following new problems have been added:
+
+<?=$values['data']?>
+
+Yours,  
+The FixMyStreet team
+
+To stop receiving emails when there are new problems,
+please follow this link: <?=$values['unsubscribe_url']?>
diff --git a/templates/email/default/alert-update.txt b/templates/email/default/alert-update.txt
new file mode 100644
index 000000000..ac0ddd50a
--- /dev/null
+++ b/templates/email/default/alert-update.txt
@@ -0,0 +1,18 @@
+Subject: New updates on problem - '<?=$values['title']?>'
+
+The following updates have been left on this problem:
+
+<?=$values['data']?>
+
+<?=$values['state_message']?>
+
+To view or reply to these updates, please visit the following URL:
+    <?=$values['problem_url']?>
+
+You cannot contact anyone by replying to this email.
+
+Yours,  
+The FixMyStreet team
+
+To stop receiving emails when there are new updates on this problem,
+please follow this link: <?=$values['unsubscribe_url']?>
diff --git a/templates/email/default/reply-autoresponse b/templates/email/default/reply-autoresponse
new file mode 100644
index 000000000..672c1f3c9
--- /dev/null
+++ b/templates/email/default/reply-autoresponse
@@ -0,0 +1,23 @@
+Subject: Automatic reply to your message to FixMyStreet
+
+Hi,
+
+This is an automatic response to your email; your email has not been delivered.
+
+If you're replying to an email about a report update, please visit
+the URL given in the email in order to leave a reply. You cannot
+reply to an update via email.
+
+If you are trying to confirm something, such as a report or an email
+alert, please click the link in the email that we sent you, or, if
+you cannot click the link, copy and paste it into the address bar of
+your web browser.
+
+If you're trying to unsubscribe from an email alert, there is an
+unsubscribe link at the bottom of the email.
+
+If you have a question or comment about the site, please send your
+email to team@fixmystreet.com
+
+Yours,
+The FixMyStreet team
diff --git a/templates/email/emptyhomes/en-gb/alert-problem-area.txt b/templates/email/emptyhomes/en-gb/alert-problem-area.txt
new file mode 100644
index 000000000..0fb11665c
--- /dev/null
+++ b/templates/email/emptyhomes/en-gb/alert-problem-area.txt
@@ -0,0 +1,13 @@
+Subject: New empty properties in <?=$values['area_name']?> on reportemptyhomes.com
+
+The following empty properties have been added within
+<?=$values['area_name']?>:
+
+<?=$values['data']?>
+
+Yours,  
+reportemptyhomes.com
+
+To stop receiving emails when there are new properties in
+<?=$values['area_name']?>, please follow this link: 
+<?=$values['unsubscribe_url']?>
diff --git a/templates/email/emptyhomes/en-gb/alert-problem-council.txt b/templates/email/emptyhomes/en-gb/alert-problem-council.txt
new file mode 100644
index 000000000..6c2d5b55c
--- /dev/null
+++ b/templates/email/emptyhomes/en-gb/alert-problem-council.txt
@@ -0,0 +1,12 @@
+Subject: New empty properties reported to <?=$values['area_name']?> on reportemptyhomes.com
+
+The following empty properties have been reported to <?=$values['area_name']?>:
+
+<?=$values['data']?>
+
+Yours,  
+reportemptyhomes.com
+
+To stop receiving emails when there are new properties reported to
+<?=$values['area_name']?>, please follow this link: 
+<?=$values['unsubscribe_url']?>
diff --git a/templates/email/emptyhomes/en-gb/alert-problem-nearby.txt b/templates/email/emptyhomes/en-gb/alert-problem-nearby.txt
new file mode 100644
index 000000000..abe027d20
--- /dev/null
+++ b/templates/email/emptyhomes/en-gb/alert-problem-nearby.txt
@@ -0,0 +1,11 @@
+Subject: New nearby empty properties on reportemptyhomes.com
+
+The following nearby empty properties have been added:
+
+<?=$values['data']?>
+
+Yours,  
+reportemptyhomes.com
+
+To stop receiving emails when there are nearby properties,
+please follow this link: <?=$values['unsubscribe_url']?>
diff --git a/templates/email/emptyhomes/en-gb/alert-problem-ward.txt b/templates/email/emptyhomes/en-gb/alert-problem-ward.txt
new file mode 100644
index 000000000..14dabc386
--- /dev/null
+++ b/templates/email/emptyhomes/en-gb/alert-problem-ward.txt
@@ -0,0 +1,13 @@
+Subject: New empty properties reported to <?=$values['area_name']?> within <?=$values['ward_name']?> on reportemptyhomes.com
+
+The following empty properties have been reported to <?=$values['area_name']?>
+within <?=$values['ward_name']?>:
+
+<?=$values['data']?>
+
+Yours,  
+reportemptyhomes.com
+
+To stop receiving emails when there are new properties reported to
+<?=$values['area_name']?> within <?=$values['ward_name']?>,
+please follow this link: <?=$values['unsubscribe_url']?>
diff --git a/templates/email/emptyhomes/en-gb/alert-problem.txt b/templates/email/emptyhomes/en-gb/alert-problem.txt
new file mode 100644
index 000000000..30dc10c42
--- /dev/null
+++ b/templates/email/emptyhomes/en-gb/alert-problem.txt
@@ -0,0 +1,11 @@
+Subject: New empty properties on reportemptyhomes.com
+
+The following empty properties have been added:
+
+<?=$values['data']?>
+
+Yours,  
+reportemptyhomes.com
+
+To stop receiving emails when there are new properties,
+please follow this link: <?=$values['unsubscribe_url']?>
diff --git a/templates/email/emptyhomes/en-gb/alert-update.txt b/templates/email/emptyhomes/en-gb/alert-update.txt
new file mode 100644
index 000000000..9ae295b3e
--- /dev/null
+++ b/templates/email/emptyhomes/en-gb/alert-update.txt
@@ -0,0 +1,13 @@
+Subject: New updates on empty property- '<?=$values['title']?>'
+
+The following updates have been left on this empty property:
+
+<?=$values['data']?>
+
+View or reply to these updates: <?=$values['problem_url']?>
+
+Yours,  
+reportemptyhomes.com
+
+To stop receiving emails when there are new updates on this property,
+please follow this link: <?=$values['unsubscribe_url']?>
diff --git a/templates/email/fiksgatami/update-confirm.txt b/templates/email/fiksgatami/update-confirm.txt
index 4d6d12369..70e1c2444 100644
--- a/templates/email/fiksgatami/update-confirm.txt
+++ b/templates/email/fiksgatami/update-confirm.txt
@@ -2,7 +2,7 @@ Subject: Bekreft din oppdatering på FiksGataMi
 
 Hei [% update.user.name %],
 
-Vennligst klikk på lenken under for å bekrefte oppdateringen du skrev "
+Vennligst klikk på lenken under for å bekrefte oppdateringen du skrev
 nettopp:
 
 [% token_url %]