9 files changed, 82 insertions, 82 deletions
diff --git a/templates/email/default/alert-problem-area.txt b/templates/email/default/alert-problem-area.txt
index 20550ec8e..548befe2f 100644
--- a/templates/email/default/alert-problem-area.txt
+++ b/templates/email/default/alert-problem-area.txt
@@ -1,22 +1,22 @@
-Subject: New <?=$values['site_name']?> reports in <?=$values['area_name']?>
+Subject: New [% site_name %] reports in [% area_name %]
 
-The following new <?=$values['site_name']?> reports have been added in
-the <?=$values['area_name']?> area:
+The following new [% site_name %] reports have been added in
+the [% area_name %] area:
 
-<?=$values['data']?>
+[% data %]
 
-<?=$values['signature']?>
+[% signature %]
 
 
 Unsubscribe?
 
-You asked us to send you an email when someone makes a new <?=$values['site_name']?>
-report in <?=$values['area_name']?>. This is a free service from <?=$values['site_name']?>.
+You asked us to send you an email when someone makes a new [% site_name %]
+report in [% area_name %]. This is a free service from [% site_name %].
 
 If you no longer wish to receive an email whenever there are new reports in
-the <?=$values['area_name']?> area, please follow this link:
+the [% area_name %] area, please follow this link:
 
-<?=$values['unsubscribe_url']?>
+[% unsubscribe_url %]
 
 This email was sent automatically, from an unmonitored email account - so please
 do not reply to it.
diff --git a/templates/email/default/alert-problem-council.txt b/templates/email/default/alert-problem-council.txt
index 8bc9d6d20..abb704870 100644
--- a/templates/email/default/alert-problem-council.txt
+++ b/templates/email/default/alert-problem-council.txt
@@ -1,22 +1,22 @@
-Subject: New <?=$values['site_name']?> reports to <?=$values['area_name']?>
+Subject: New [% site_name %] reports to [% area_name %]
 
-The following new <?=$values['site_name']?> reports have been sent to
-<?=$values['area_name']?>:
+The following new [% site_name %] reports have been sent to
+[% area_name %]:
 
-<?=$values['data']?>
+[% data %]
 
-<?=$values['signature']?>
+[% signature %]
 
 
 Unsubscribe?
 
-You asked us to send you an email when someone makes a new <?=$values['site_name']?>
-report to <?=$values['area_name']?>. This is a free service from <?=$values['site_name']?>.
+You asked us to send you an email when someone makes a new [% site_name %]
+report to [% area_name %]. This is a free service from [% site_name %].
 
 If you no longer wish to receive an email whenever there are new reports made to
-<?=$values['area_name']?>, please follow this link:
+[% area_name %], please follow this link:
 
-<?=$values['unsubscribe_url']?>
+[% unsubscribe_url %]
 
 This email was sent automatically, from an unmonitored email account - so please
 do not reply to it.
diff --git a/templates/email/default/alert-problem-nearby.txt b/templates/email/default/alert-problem-nearby.txt
index 3dc562840..1a4f713e8 100644
--- a/templates/email/default/alert-problem-nearby.txt
+++ b/templates/email/default/alert-problem-nearby.txt
@@ -1,22 +1,22 @@
-Subject: New reports on <?=$values['site_name']?>
+Subject: New reports on [% site_name %]
 
-The following <?=$values['site_name']?> reports have been made within the area
+The following [% site_name %] reports have been made within the area
 you specified:
 
-<?=$values['data']?>
+[% data %]
 
-<?=$values['signature']?>
+[% signature %]
 
 
 Unsubscribe?
 
-You asked us to send you an email when someone makes a new <?=$values['site_name']?>
-report within your chosen area. This is a free service from <?=$values['site_name']?>.
+You asked us to send you an email when someone makes a new [% site_name %]
+report within your chosen area. This is a free service from [% site_name %].
 
 If you no longer wish to receive an email whenever there are new reports within
 this area, please follow this link:
 
-<?=$values['unsubscribe_url']?>
+[% unsubscribe_url %]
 
 This email was sent automatically, from an unmonitored email account - so please
 do not reply to it.
diff --git a/templates/email/default/alert-problem-ward.txt b/templates/email/default/alert-problem-ward.txt
index 9bcc770b1..e757a2963 100644
--- a/templates/email/default/alert-problem-ward.txt
+++ b/templates/email/default/alert-problem-ward.txt
@@ -1,24 +1,24 @@
-Subject: New <?=$values['site_name']?> reports to <?=$values['area_name']?> within <?=$values['ward_name']?>
+Subject: New [% site_name %] reports to [% area_name %] within [% ward_name %]
 
-The following new <?=$values['site_name']?> reports have been sent to <?=$values['area_name']?>
-within <?=$values['ward_name']?>:
+The following new [% site_name %] reports have been sent to [% area_name %]
+within [% ward_name %]:
 
-<?=$values['data']?>
+[% data %]
 
-<?=$values['signature']?>
+[% signature %]
 
 
 Unsubscribe?
 
-You subscribed to receive an email every time someone makes a new <?=$values['site_name']?>
-report to <?=$values['area_name']?> within <?=$values['ward_name']?>.This is a
-free service from <?=$values['site_name']?>.
+You subscribed to receive an email every time someone makes a new [% site_name %]
+report to [% area_name %] within [% ward_name %]. This is a
+free service from [% site_name %].
 
 If you no longer wish to receive an email whenever there are new reports to
-<?=$values['area_name']?> within <?=$values['ward_name']?>, please follow
+[% area_name %] within [% ward_name %], please follow
 this link:
 
-<?=$values['unsubscribe_url']?>
+[% unsubscribe_url %]
 
 This email was sent automatically, from an unmonitored email account - so please
 do not reply to it.
diff --git a/templates/email/default/alert-problem.txt b/templates/email/default/alert-problem.txt
index edce34931..7163ee7bf 100644
--- a/templates/email/default/alert-problem.txt
+++ b/templates/email/default/alert-problem.txt
@@ -1,21 +1,21 @@
-Subject: New reports on <?=$values['site_name']?>
+Subject: New reports on [% site_name %]
 
-The following new reports have been added to <?=$values['site_name']?>:
+The following new reports have been added to [% site_name %]:
 
-<?=$values['data']?>
+[% data %]
 
-<?=$values['signature']?>
+[% signature %]
 
 
 Unsubscribe?
 
-You subscribed to receive an email when someone makes a new <?=$values['site_name']?>
-report. This is a free service from <?=$values['site_name']?>.
+You subscribed to receive an email when someone makes a new [% site_name %]
+report. This is a free service from [% site_name %].
 
-If you no longer wish to receive an email whenever there are new <?=$values['site_name']?>
+If you no longer wish to receive an email whenever there are new [% site_name %]
 reports please follow this link:
 
-<?=$values['unsubscribe_url']?>
+[% unsubscribe_url %]
 
 This email was sent automatically, from an unmonitored email account - so please
 do not reply to it.
diff --git a/templates/email/default/alert-update.txt b/templates/email/default/alert-update.txt
index 93ba11e01..7722d2c1f 100644
--- a/templates/email/default/alert-update.txt
+++ b/templates/email/default/alert-update.txt
@@ -1,27 +1,27 @@
-Subject: New <?=$values['site_name']?> updates on report: '<?=$values['title']?>'
+Subject: New [% site_name %] updates on report: '[% title %]'
 
 You asked us to send you an email every time an update was made to the
-<?=$values['site_name']?> report: <?=$values['title']?>.
+[% site_name %] report: [% title %].
 
 The following updates have been left on this report:
 
-<?=$values['data']?>
+[% data %]
 
-<?=$values['state_message']?>
+[% state_message %]
 
 If you would like to view or reply to these updates, please visit the following URL:
-    <?=$values['problem_url']?>
+    [% problem_url %]
 
 This email was sent automatically, from an unmonitored email account - so
 please do not reply to it.
 
-<?=$values['signature']?>
+[% signature %]
 
 
 Unsubscribe?
 
 We currently email you whenever someone leaves an update on the
-<?=$values['site_name']?> report: <?=$values['title']?>.
+[% site_name %] report: [% title %].
 
 If you no longer wish to receive an email whenever this report is updated,
-please follow this link: <?=$values['unsubscribe_url']?>
+please follow this link: [% unsubscribe_url %]
diff --git a/templates/email/default/confirm_report_sent.txt b/templates/email/default/confirm_report_sent.txt
index 735d52027..8c79b59e1 100644
--- a/templates/email/default/confirm_report_sent.txt
+++ b/templates/email/default/confirm_report_sent.txt
@@ -1,14 +1,14 @@
-Subject: <?=$values['site_name']?> Report Sent: <?=$values['title']?>
+Subject: [% site_name %] Report Sent: [% title %]
 
 Hello,
 
-Thank you for using <?=$values['site_name']?> to submit your report
-"<?=$values['title']?>".
+Thank you for using [% site_name %] to submit your report
+"[% title %]".
 
-This is to confirm that it has now been sent to <?=$values['bodies_name']?>,
+This is to confirm that it has now been sent to [% bodies_name %],
 who should respond to you directly.
 
-Your report is also on <?=$values['url']?>, where others may read, comment or
+Your report is also on [% url %], where others may read, comment or
 offer advice.
 
 You should also feel free to add updates to that page, although note that they
@@ -19,7 +19,7 @@ can respond to them directly.
 
 Good luck in getting your problem fixed.
 
-<?=$values['signature']?>
+[% signature %]
 
 This email was sent automatically, from an unmonitored email account - so
 please do not reply to it.
diff --git a/templates/email/default/questionnaire.txt b/templates/email/default/questionnaire.txt
index 4257792da..80b556c41 100644
--- a/templates/email/default/questionnaire.txt
+++ b/templates/email/default/questionnaire.txt
@@ -1,24 +1,24 @@
-Subject: Questionnaire about your <?=$values['site_name']?> report: '<?=$values['title']?>'
+Subject: Questionnaire about your [% site_name %] report: '[% title %]'
 
-Hello <?=$values['name']?>,
+Hello [% name %],
 
-<?=$values['created']?> ago, you reported a problem using <?=$values['site_name']?>.
+[% created %] ago, you reported a problem using [% site_name %].
 
 The details of that report are at the end of this email.
 
-To keep <?=$values['site_name']?> up to date and relevant, we'd appreciate it
+To keep [% site_name %] up to date and relevant, we'd appreciate it
 if you could follow the link below and fill in our short questionnaire
 updating the status of your problem:
 
-    <?=$values['url']?>
+    [% url %]
 
-<?=$values['signature']?>
+[% signature %]
 
 Your report was as follows:
 
-<?=$values['title']?>
+[% title %]
 
-<?=$values['detail']?>
+[% detail %]
 
 This email was sent automatically, from an unmonitored email account - so
 please do not reply to it.
diff --git a/templates/email/default/submit.txt b/templates/email/default/submit.txt
index 52d52669b..3b6549d8e 100644
--- a/templates/email/default/submit.txt
+++ b/templates/email/default/submit.txt
@@ -1,38 +1,38 @@
-Subject: Problem Report: <?=$values['title']?>
+Subject: Problem Report: [% title %]
 
-Dear <?=$values['bodies_name']?>,
+Dear [% bodies_name %],
 
-<?=$values['missing']?><?=$values['multiple']?>A user of
-<?=$values['site_name']?> has submitted the following report
+[% missing %][% multiple %]A user of
+[% 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,
+[% fuzzy %], or to provide an update on the problem,
 please visit the following link:
 
-    <?=$values['url']?>
+    [% url %]
 
-<?=$values['has_photo']?>----------
+[% has_photo %]----------
 
-Name: <?=$values['name']?>
+Name: [% name %]
 
-Email: <?=$values['email']?>
+Email: [% email %]
 
-<?=$values['phone_line']?><?=$values['category_line']?>Subject: <?=$values['title']?>
+[% phone_line %][% category_line %]Subject: [% title %]
 
-Details: <?=$values['detail']?>
+Details: [% detail %]
 
-<?=$values['easting_northing']?>Latitude: <?=$values['latitude']?>
+[% easting_northing %]Latitude: [% latitude %]
 
-Longitude: <?=$values['longitude']?>
+Longitude: [% longitude %]
 
-View OpenStreetMap of this location: <?=$values['osm_url']?>
+View OpenStreetMap of this location: [% osm_url %]
 
-<?=$values['closest_address']?>----------
+[% closest_address %]----------
 
 Replies to this email will go to the user who submitted the problem.
 
-<?=$values['signature']?>
+[% signature %]
 
 If there is a more appropriate email address for messages about
-<?=$values['category_footer']?>, please let us know. This will help improve the
+[% category_footer %], please let us know. This will help improve the
 service for local people. We also welcome any other feedback you may have.