10 files changed, 18 insertions, 18 deletions
diff --git a/templates/email/default/alert-confirm.txt b/templates/email/default/alert-confirm.txt
index 886b04b00..74fe7e64e 100644
--- a/templates/email/default/alert-confirm.txt
+++ b/templates/email/default/alert-confirm.txt
@@ -1,6 +1,6 @@
-Subject: Confirm your [% INCLUDE 'site-name.txt' | trim %] alert
+Subject: Confirm your [% site_name %] alert
 
-Please click on the link below to confirm your [% INCLUDE 'site-name.txt' | trim %] alert.
+Please click on the link below to confirm your [% site_name %] alert.
 
    [% token_url %]
 
@@ -8,11 +8,11 @@ If you can't click the link, copy and paste it to the address bar of your web
 browser.
 
 This confirms that you'd like to receive an email when someone makes a
-[% INCLUDE 'site-name.txt' | trim %] report within your chosen area.
+[% site_name %] report within your chosen area.
 
-Email alerts are a free service from [% INCLUDE 'site-name.txt' | trim %].
+Email alerts are a free service from [% site_name %].
 
-[% INCLUDE 'signature.txt' %]
+[% signature %]
 
 This email was sent automatically, from an unmonitored email account - so
 please do not reply to it.
diff --git a/templates/email/default/change_email.txt b/templates/email/default/change_email.txt
index 8db6b105e..3d3328b8f 100644
--- a/templates/email/default/change_email.txt
+++ b/templates/email/default/change_email.txt
@@ -5,7 +5,7 @@ email address on [% site_name %].
 
 [% c.uri_for_action( 'auth/token', token ) %]
 
-[% INCLUDE 'signature.txt' %]
+[% signature %]
 
 This email was sent automatically, from an unmonitored email account - so
 please do not reply to it.
diff --git a/templates/email/default/login.txt b/templates/email/default/login.txt
index 9a57c4fd9..61920daf7 100644
--- a/templates/email/default/login.txt
+++ b/templates/email/default/login.txt
@@ -7,7 +7,7 @@ Please click on the link below to confirm your email address.
 Once you've done this, you'll be able to view and manage all reports and
 updates you've made on [% site_name %].
 
-[% INCLUDE 'signature.txt' %]
+[% signature %]
 
 This email was sent automatically, from an unmonitored email account - so
 please do not reply to it.
diff --git a/templates/email/default/other-reported.txt b/templates/email/default/other-reported.txt
index b626e56d9..559b0933b 100644
--- a/templates/email/default/other-reported.txt
+++ b/templates/email/default/other-reported.txt
@@ -21,7 +21,7 @@ And details:
 
 [% report.detail %]
 
-[% INCLUDE 'signature.txt' %]
+[% signature %]
 
 This email was sent automatically, from an unmonitored email account - so
 please do not reply to it.
diff --git a/templates/email/default/other-updated.txt b/templates/email/default/other-updated.txt
index 21ea68863..5b5195f80 100644
--- a/templates/email/default/other-updated.txt
+++ b/templates/email/default/other-updated.txt
@@ -12,7 +12,7 @@ Your update reads:
 
 [% update.text %]
 
-[% INCLUDE 'signature.txt' %]
+[% signature %]
 
 This email was sent automatically, from an unmonitored email account - so
 please do not reply to it.
diff --git a/templates/email/default/partial.txt b/templates/email/default/partial.txt
index fb5e17c10..ea405f0b4 100644
--- a/templates/email/default/partial.txt
+++ b/templates/email/default/partial.txt
@@ -1,8 +1,8 @@
-Subject: Confirm your report on [% INCLUDE 'site-name.txt' | trim %]
+Subject: Confirm your report on [% site_name %]
 
 Hello [% report.name || report.email %],
 
-To confirm the report you have uploaded to [% INCLUDE 'site-name.txt' | trim %]
+To confirm the report you have uploaded to [% site_name %]
 via [% report.service %], and to check or add any details, please visit the
 following URL:
 
@@ -10,7 +10,7 @@ following URL:
 
 Thanks!
 
-[% INCLUDE 'signature.txt' %]
+[% signature %]
 
 This email was sent automatically, from an unmonitored email account - so
 please do not reply to it.
diff --git a/templates/email/default/problem-confirm-not-sending.txt b/templates/email/default/problem-confirm-not-sending.txt
index d27b47677..06e84e6d5 100644
--- a/templates/email/default/problem-confirm-not-sending.txt
+++ b/templates/email/default/problem-confirm-not-sending.txt
@@ -25,7 +25,7 @@ Thank you for supporting [% site_name %].
 
 
 
-[% INCLUDE 'signature.txt' %]
+[% signature %]
 
 This email was sent automatically, from an unmonitored email account - so
 please do not reply to it.
diff --git a/templates/email/default/problem-confirm.txt b/templates/email/default/problem-confirm.txt
index e9e7378d1..693d7a131 100644
--- a/templates/email/default/problem-confirm.txt
+++ b/templates/email/default/problem-confirm.txt
@@ -29,7 +29,7 @@ Thank you for submitting a report through [% site_name %].
 
 
 
-[% INCLUDE 'signature.txt' %]
+[% signature %]
 
 This email was sent automatically, from an unmonitored email account - so
 please do not reply to it.
diff --git a/templates/email/default/problem-moderated.txt b/templates/email/default/problem-moderated.txt
index f69004be2..7c1c3b5c2 100644
--- a/templates/email/default/problem-moderated.txt
+++ b/templates/email/default/problem-moderated.txt
@@ -31,7 +31,7 @@ the team at [% report_complain_uri %]
 Thank you for submitting a report through [% site_name %].
 
 
-[% INCLUDE 'signature.txt' %]
+[% signature %]
 
 This email was sent automatically, from an unmonitored email account - so
 please do not reply to it.
diff --git a/templates/email/default/update-confirm.txt b/templates/email/default/update-confirm.txt
index 039a3bb39..669645f0a 100644
--- a/templates/email/default/update-confirm.txt
+++ b/templates/email/default/update-confirm.txt
@@ -1,8 +1,8 @@
-Subject: Confirm your update on [% INCLUDE 'site-name.txt' | trim %]
+Subject: Confirm your update on [% site_name %]
 
 Hello [% update.name %],
 
-Please click on the link below to confirm your update on [% INCLUDE 'site-name.txt' | trim %]:
+Please click on the link below to confirm your update on [% site_name %]:
 
 [% token_url %]
 
@@ -15,7 +15,7 @@ Your update reads:
 
 [% INCLUDE 'update-confirm-donotsend.txt' %]
 
-[% INCLUDE 'signature.txt' %]
+[% signature %]
 
 This email was sent automatically, from an unmonitored email account - so
 please do not reply to it.