Use site_name to genericise default submit.txt.

3 files changed, 47 insertions, 11 deletions

diff --git a/templates/email/default/submit.txt b/templates/email/default/submit.txt
index 315411fb4..0ab29e412 100644
--- a/templates/email/default/submit.txt
+++ b/templates/email/default/submit.txt
@@ -3,7 +3,7 @@ Subject: Problem Report: <?=$values['title']?>
 Dear <?=$values['bodies_name']?>,
 
 <?=$values['missing']?><?=$values['multiple']?>A user of
-FixMyStreet has submitted the following report
+<?=$values['site_name']?> has submitted the following report
 of a local problem that they believe might require your attention.
 
 <?=$values['fuzzy']?>, or to provide an update on the problem,
@@ -31,13 +31,6 @@ Replies to this email will go to the user who submitted the problem.
 
 <?=$values['signature']?>
 
-This message was sent via FixMyStreet, a project of UKCOD, registered charity
-number 1076346. If there is a more appropriate email address for messages about
-<?=$values['category_footer']?>, please let us know by visiting <https://www.fixmystreet.com/contact>.
-This will help improve the service for local people. We
-also welcome any other feedback you may have.
-
-FixMyStreet is now available for full integration into council
-websites, making life easier for both you and your residents.
-Read more here: https://www.fixmystreet.com/council
-
+If there is a more appropriate email address for messages about
+<?=$values['category_footer']?>, please let us know. This will help improve the
+service for local people. We also welcome any other feedback you may have.
diff --git a/templates/email/default/submit-brent.txt b/templates/email/fixmystreet/submit-brent.txt
index 37adde4df..37adde4df 100644
--- a/templates/email/default/submit-brent.txt
+++ b/templates/email/fixmystreet/submit-brent.txt
diff --git a/templates/email/fixmystreet/submit.txt b/templates/email/fixmystreet/submit.txt
new file mode 100644
index 000000000..315411fb4
--- /dev/null
+++ b/templates/email/fixmystreet/submit.txt
@@ -0,0 +1,43 @@
+Subject: Problem Report: <?=$values['title']?>
+
+Dear <?=$values['bodies_name']?>,
+
+<?=$values['missing']?><?=$values['multiple']?>A user of
+FixMyStreet has submitted the following report
+of a local problem that they believe might require your attention.
+
+<?=$values['fuzzy']?>, or to provide an update on the problem,
+please visit the following link:
+
+    <?=$values['url']?>
+
+<?=$values['has_photo']?>----------
+
+Name: <?=$values['name']?>
+
+Email: <?=$values['email']?>
+
+<?=$values['phone_line']?><?=$values['category_line']?>Subject: <?=$values['title']?>
+
+Details: <?=$values['detail']?>
+
+<?=$values['easting_northing']?>Latitude: <?=$values['latitude']?>
+
+Longitude: <?=$values['longitude']?>
+
+<?=$values['closest_address']?>----------
+
+Replies to this email will go to the user who submitted the problem.
+
+<?=$values['signature']?>
+
+This message was sent via FixMyStreet, a project of UKCOD, registered charity
+number 1076346. If there is a more appropriate email address for messages about
+<?=$values['category_footer']?>, please let us know by visiting <https://www.fixmystreet.com/contact>.
+This will help improve the service for local people. We
+also welcome any other feedback you may have.
+
+FixMyStreet is now available for full integration into council
+websites, making life easier for both you and your residents.
+Read more here: https://www.fixmystreet.com/council
+