diff --git a/includes/class_notification.php b/includes/class_notification.php
index 80969ae..43400cd 100644
--- a/includes/class_notification.php
+++ b/includes/class_notification.php
@@ -281,7 +281,7 @@ class NotificationCenter
if ($this->users["$userid"]['options'][0] & $this->registry->emailoptions['notifications']['assignedto'] AND in_array($userid, $this->roles['-notapplicable-']))
{
$user = construct_user_display($this->registry->userinfo, false);
- eval('$part = "' . $this->registry->template->fetch('email/notice_unassigned.part') . '";');
+ eval('$part = "' . $this->registry->template->fetch(FetchEmailPath('notice_unassigned.part', $this->_localeFromUserId($userid))) . '";');
$this->notices["$userid"][] = $part;
}
}
@@ -299,7 +299,7 @@ class NotificationCenter
if ($this->users["$userid"]['options'][0] & $this->registry->emailoptions['notifications']['assignedto'] AND in_array($userid, $this->roles['-notapplicable-']))
{
$user = construct_user_display($this->registry->userinfo, false);
- eval('$email = "' . $this->registry->template->fetch('email/notice_assigned.part') . '";');
+ eval('$email = "' . $this->registry->template->fetch(FetchEmailPath('notice_assigned.part', $this->_localeFromUserId($userid))) . '";');
$this->notices["$userid"][] = $email;
}
}
@@ -318,7 +318,7 @@ class NotificationCenter
$userlist = $this->fetch_users_with_on_bit('statusresolve');
foreach ($userlist AS $userid => $user)
{
- eval('$email = "' . $this->registry->template->fetch('email/notice_status.part') . '";');
+ eval('$email = "' . $this->registry->template->fetch(FetchEmailPath('notice_status.part', $this->_localeFromUserId($userid))) . '";');
$this->notices["$user[userid]"][] = $email;
}
}
@@ -337,7 +337,7 @@ class NotificationCenter
$userlist = $this->fetch_users_with_on_bit('statusresolve');
foreach ($userlist AS $userid => $user)
{
- eval('$email = "' . $this->registry->template->fetch('email/notice_resolution.part') . '";');
+ eval('$email = "' . $this->registry->template->fetch(FetchEmailPath('notice_resolution.part', $this->_localeFromUserId($userid))) . '";');
$this->notices["$user[userid]"][] = $email;
}
}
@@ -356,7 +356,7 @@ class NotificationCenter
$userlist = $this->fetch_useres_with_on_bit('duplicates');
foreach ($userlist AS $userid => $user)
{
- eval('$email = "' . $this->registry->template->fetch('email/notice_duplicates.part') . '";');
+ eval('$email = "' . $this->registry->template->fetch(FetchEmailPath('notice_duplicates.part', $this->_localeFromUserId($userid))) . '";');
$this->notices["$user[userid]"][] = $email;
}
}
@@ -375,7 +375,7 @@ class NotificationCenter
$userlist = $this->fetch_users_with_on_bit('otherfield');
foreach ($userlist AS $userid => $user)
{
- eval('$email = "' . $this->registry->template->fetch('email/notice_severity.part') . '";');
+ eval('$email = "' . $this->registry->template->fetch(FetchEmailPath('notice_severity.part', $this->_localeFromUserId($userid))) . '";');
$this->notices["$user[userid]"][] = $email;
}
}
@@ -394,7 +394,7 @@ class NotificationCenter
$userlist = $this->fetch_users_with_on_bit('otherfield');
foreach ($userlist AS $userid => $user)
{
- eval('$email = "' . $this->registry->template->fetch('email/notice_priority.part') . '";');
+ eval('$email = "' . $this->registry->template->fetch(FetchEmailPath('notice_priority.part', $this->_localeFromUserId($userid))) . '";');
$this->notices["$user[userid]"][] = $email;
}
}
@@ -419,7 +419,7 @@ class NotificationCenter
foreach ($userlist AS $userid => $user)
{
- eval('$email = "' . $this->registry->template->fetch('email/notice_product.part') . '";');
+ eval('$email = "' . $this->registry->template->fetch(FetchEmailPath('notice_product.part', $this->_localeFromUserId($userid))) . '";');
$this->notices["$user[userid]"][] = $email;
}
}
@@ -441,7 +441,7 @@ class NotificationCenter
$user = construct_user_display($this->registry->userinfo, false);
$date = $this->registry->modules['date']->format($this->registry->options['dateformat'], $comment['dateline']);
- eval('$email = "' . $this->registry->template->fetch('email/notice_comment.part') . '";');
+ eval('$email = "' . $this->registry->template->fetch(FetchEmailPath('notice_comment.part', $this->_localeFromUserId($userid))) . '";');
$this->notices["$userid"][] = $email;
}
}
@@ -461,7 +461,7 @@ class NotificationCenter
$userlist = $this->fetch_users_with_on_bit('otherfield');
foreach ($userlist AS $userid => $user)
{
- eval('$email = "' . $this->registry->template->fetch('email/notice_other.part') . '";');
+ eval('$email = "' . $this->registry->template->fetch(FetchEmailPath('notice_other.part', $this->_localeFromUserId($userid))) . '";');
$this->notices["$user[userid]"][] = $email;
}
}
@@ -485,7 +485,7 @@ class NotificationCenter
$user = construct_user_display($this->registry->userinfo, false);
$obsoletes = implode(', ', (array)$obsolete);
- eval('$email = "' . $this->registry->template->fetch('email/notice_attachment.part') . '";');
+ eval('$email = "' . $this->registry->template->fetch(FetchEmailPath('notice_attachment.part', $this->_localeFromUserId($userid))) . '";');
$this->notices["$userid"][] = $email;
}
}
@@ -517,7 +517,7 @@ class NotificationCenter
{
$user = construct_user_display($this->registry->userinfo, false);
$product = $this->registry->datastore['product']["$bug[product]"]['title'] . '/' . ($bug['component'] ? $this->registry->datastore['product']["$bug[component]"]['title'] . '/' : '') . $this->registry->datastore['version']["$bug[version]"]['version'];
- eval('$email = "' . $this->registry->template->fetch('email/notice_new_bug.part') . '";');
+ eval('$email = "' . $this->registry->template->fetch(FetchEmailPath('notice_new_bug.part', $this->_localeFromUserId($userInfo['userid']))) . '";');
$this->notices["$userInfo[userid]"][] = $email;
$this->users["$userInfo[userid]"] = $userInfo;
unset($this->users["$userInfo[userid]"]['mask'], $this->users["$userInfo[userid]"]['relation']);
@@ -590,7 +590,7 @@ class NotificationCenter
$parts = implode("\n\n", $noticelist);
- eval('$email = "' . $this->registry->template->fetch('email/bugnotification.xml') . '";');
+ eval('$email = "' . $this->registry->template->fetch(FetchEmailPath('bugnotification.xml', $this->_localeFromUserId($userid))) . '";');
$email = $this->registry->xml->parse($email);
$this->registry->mail->setSubject($email['email']['subject']['value']);
$this->registry->mail->setBodyText($email['email']['bodyText']['value']);
@@ -605,6 +605,19 @@ class NotificationCenter
}
}
}
+
+ // ###################################################################
+ /**
+ * Returns the locale name from a given user ID
+ *
+ * @param integer User ID
+ *
+ * @return string Locale
+ */
+ function _localeFromUserId($userid)
+ {
+ return $this->registry->datastore['language'][$this->users[$userid]['languageid']]['langcode'];
+ }
}
/*=====================================================================*\
diff --git a/includes/functions.php b/includes/functions.php
index e2c9309..37e1ef7 100755
--- a/includes/functions.php
+++ b/includes/functions.php
@@ -776,6 +776,21 @@ function FetchUserPermissions(&$user)
return $perms;
}
+// ###################################################################
+/**
+* Fetches the path for an email template, given the name of the
+* template and the locale to use
+*
+* @param string The template name
+* @param string Language locale code
+*
+* @return string Template path
+*/
+function FetchEmailPath($name, $locale)
+{
+ return '../locale/' . $locale . '/emails/' . $name;
+}
+
/*=====================================================================*\
|| ###################################################################
|| # $HeadURL$
diff --git a/locale/en_US/emails/accountapproved.xml.tpl b/locale/en_US/emails/accountapproved.xml.tpl
new file mode 100644
index 0000000..d60908c
--- /dev/null
+++ b/locale/en_US/emails/accountapproved.xml.tpl
@@ -0,0 +1,8 @@
+<email>
+ <subject>Account Approved at {$bugsys->options['trackertitle']}</subject>
+ <bodyText>Hi $user[displayname],
+
+Your account was awaiting moderation at {$bugsys->options['trackertitle']}. Today, an administrator approved your registration and you are now able to use the bug tracker fully.
+
+If you have any questions, please don't hesitate to contact the webmaster.</bodyText>
+</email>
\ No newline at end of file
diff --git a/locale/en_US/emails/activateaccount.xml.tpl b/locale/en_US/emails/activateaccount.xml.tpl
new file mode 100644
index 0000000..ae4f98a
--- /dev/null
+++ b/locale/en_US/emails/activateaccount.xml.tpl
@@ -0,0 +1,8 @@
+<email>
+ <subject>Welcome to {$bugsys->options['trackertitle']}</subject>
+ <bodyText>Hi {$bugsys->in['displayname']},
+
+Welcome to the {$bugsys->options['trackertitle']} tracker. Before you can begin posting bug reports, you'll need to activae your account. To do this, please click this link:
+
+{$bugsys->options['trackerurl']}/register.php?do=activate&userid=$userid&activator=$activationid</bodyText>
+</email>
\ No newline at end of file
diff --git a/locale/en_US/emails/bugnotification.xml.tpl b/locale/en_US/emails/bugnotification.xml.tpl
new file mode 100644
index 0000000..e301974
--- /dev/null
+++ b/locale/en_US/emails/bugnotification.xml.tpl
@@ -0,0 +1,18 @@
+<email>
+ <subject>{$this->registry->options['trackertitle']} Bug Notification - {$this->bug['summary']}</subject>
+ <bodyText>Hi {$this->users[$userid]['displayname']},
+
+You are receiving this email because you have opted to get notifications for the {$this->registry->options['trackertitle']} bug tracker.
+
+The bug is "{$this->bug['summary']}" (id: {$this->bug['bugid']}) located at {$this->registry->options['trackerurl']}/showreport.php?bugid={$this->bug['bugid']}
+
+Here are the notices:
+###################################################################
+
+$parts
+
+###################################################################
+If you no longer want to receive email from us, please log into your account and click the "My Controls" tab at the top of the screen to change email preferences.
+
+{$this->registry->options['trackerurl']}</bodyText>
+</email>
\ No newline at end of file
diff --git a/locale/en_US/emails/notice_assigned.part.tpl b/locale/en_US/emails/notice_assigned.part.tpl
new file mode 100644
index 0000000..b99df20
--- /dev/null
+++ b/locale/en_US/emails/notice_assigned.part.tpl
@@ -0,0 +1 @@
+You have been assigned to this bug by $user.
\ No newline at end of file
diff --git a/locale/en_US/emails/notice_attachment.part.tpl b/locale/en_US/emails/notice_attachment.part.tpl
new file mode 100644
index 0000000..53fee41
--- /dev/null
+++ b/locale/en_US/emails/notice_attachment.part.tpl
@@ -0,0 +1,8 @@
+$user has uploaded a new attachment:
+============================================
+File name: $attachment[filename]
+Description: $attachment[description]
+File size: $attachment[filesize] Bytes
+Makes obsolete: $obsoletes
+View: {$this->registry->options['trackerurl']}/viewattachment.php?attachmentid=$id
+============================================
\ No newline at end of file
diff --git a/locale/en_US/emails/notice_comment.part.tpl b/locale/en_US/emails/notice_comment.part.tpl
new file mode 100644
index 0000000..49e4c7e
--- /dev/null
+++ b/locale/en_US/emails/notice_comment.part.tpl
@@ -0,0 +1,4 @@
+The following comment was added by $user on $date:
+============================================
+$comment[comment]
+============================================
\ No newline at end of file
diff --git a/locale/en_US/emails/notice_duplicates.part.tpl b/locale/en_US/emails/notice_duplicates.part.tpl
new file mode 100644
index 0000000..8841d1a
--- /dev/null
+++ b/locale/en_US/emails/notice_duplicates.part.tpl
@@ -0,0 +1 @@
+The duplicates list has changed from "$old" to "$new".
\ No newline at end of file
diff --git a/locale/en_US/emails/notice_new_bug.part.tpl b/locale/en_US/emails/notice_new_bug.part.tpl
new file mode 100644
index 0000000..362ddab
--- /dev/null
+++ b/locale/en_US/emails/notice_new_bug.part.tpl
@@ -0,0 +1,11 @@
+This bug has been added to the database:
+============================================
+Bug ID: $bug[bugid]
+Summary: $bug[summary]
+Reporter: $user
+Product/Component/Version: $product
+Initial report:
+--------------------------------------------
+$comment[comment]
+--------------------------------------------
+============================================
\ No newline at end of file
diff --git a/locale/en_US/emails/notice_other.part.tpl b/locale/en_US/emails/notice_other.part.tpl
new file mode 100644
index 0000000..fa73394
--- /dev/null
+++ b/locale/en_US/emails/notice_other.part.tpl
@@ -0,0 +1 @@
+The $name field changed from "$old" to "$new".
\ No newline at end of file
diff --git a/locale/en_US/emails/notice_priority.part.tpl b/locale/en_US/emails/notice_priority.part.tpl
new file mode 100644
index 0000000..c8294fb
--- /dev/null
+++ b/locale/en_US/emails/notice_priority.part.tpl
@@ -0,0 +1 @@
+The priority has been elevatd from "{$this->registry->datastore['priority'][$old]['priority']}" to "{$this->registry->datastore['priority'][$new]['priority']}".
\ No newline at end of file
diff --git a/locale/en_US/emails/notice_product.part.tpl b/locale/en_US/emails/notice_product.part.tpl
new file mode 100644
index 0000000..d7038e7
--- /dev/null
+++ b/locale/en_US/emails/notice_product.part.tpl
@@ -0,0 +1 @@
+The product, component, and version combination has changed from "$old" to "$new".
\ No newline at end of file
diff --git a/locale/en_US/emails/notice_resolution.part.tpl b/locale/en_US/emails/notice_resolution.part.tpl
new file mode 100644
index 0000000..5ed9152
--- /dev/null
+++ b/locale/en_US/emails/notice_resolution.part.tpl
@@ -0,0 +1 @@
+This bug has been resolved with resolution "{$this->registry->datastore['resolution'][$new]['resolution']}", from "{$this->registry->datastore['resolution'][$old]['resolution']}".
\ No newline at end of file
diff --git a/locale/en_US/emails/notice_severity.part.tpl b/locale/en_US/emails/notice_severity.part.tpl
new file mode 100644
index 0000000..4408d92
--- /dev/null
+++ b/locale/en_US/emails/notice_severity.part.tpl
@@ -0,0 +1 @@
+The severity has been elevated from "{$this->registry->datastore['severity'][$old]['severity']}" to "{$this->registry->datastore['severity'][$new]['severity']}".
\ No newline at end of file
diff --git a/locale/en_US/emails/notice_status.part.tpl b/locale/en_US/emails/notice_status.part.tpl
new file mode 100644
index 0000000..6115362
--- /dev/null
+++ b/locale/en_US/emails/notice_status.part.tpl
@@ -0,0 +1 @@
+The status of the bug is now "{$this->registry->datastore['status'][$new]['status']}", from "{$this->registry->datastore['status'][$old]['status']}".
\ No newline at end of file
diff --git a/locale/en_US/emails/notice_unassigned.part.tpl b/locale/en_US/emails/notice_unassigned.part.tpl
new file mode 100644
index 0000000..72c9917
--- /dev/null
+++ b/locale/en_US/emails/notice_unassigned.part.tpl
@@ -0,0 +1 @@
+You are no longer assigned to this bug, per $user's changes.
\ No newline at end of file
diff --git a/locale/en_US/emails/passwordreset.xml.tpl b/locale/en_US/emails/passwordreset.xml.tpl
new file mode 100644
index 0000000..eab2f01
--- /dev/null
+++ b/locale/en_US/emails/passwordreset.xml.tpl
@@ -0,0 +1,10 @@
+<email>
+ <subject>{$bugsys->options['trackertitle']} Password Reset</subject>
+ <bodyText>Hi {$user->objdata['displayname']},
+
+You requested this lost password email at the {$bugsys->options['trackertitle']} bug tracker. To reset your password, simply click the link below (or paste it into your browser window exactly) and enter a new password.
+
+{$bugsys->options['trackerurl']}/login.php?do=recoverpw&activator=$activator
+
+If you did not request this, do not worry as this notice will expire in 24 hours.</bodyText>
+</email>
\ No newline at end of file
diff --git a/locale/en_US/emails/welcome.xml.tpl b/locale/en_US/emails/welcome.xml.tpl
new file mode 100644
index 0000000..494779a
--- /dev/null
+++ b/locale/en_US/emails/welcome.xml.tpl
@@ -0,0 +1,8 @@
+<email>
+ <subject>Welcome to {$bugsys->options['trackertitle']}</subject>
+ <bodyText>Hi {$displayName},
+
+Thank you for taking the time to register at {$bugsys->options['trackertitle']}. We look forward to your contributations to making our products better.
+
+If you have any questions, please don't hesitate to contact the webmaster.</bodyText>
+</email>
\ No newline at end of file
diff --git a/login.php b/login.php
index a94366a..5e7bb84 100755
--- a/login.php
+++ b/login.php
@@ -121,7 +121,7 @@ if ($_POST['do'] == 'sendpw')
$activator = $funct->rand(25);
$db->query("INSERT INTO " . TABLE_PREFIX . "passwordreset (activatorid, dateline, userid) VALUES ('" . $activator . "', " . TIMENOW . ", " . $user->objdata['userid'] . ")");
- eval('$email = "' . $template->fetch('email/passwordreset.xml') . '";');
+ eval('$email = "' . $template->fetch(FetchEmailPath('passwordreset.xml', $bugsys->datastore['language'][$user->objdata['languageid']]['langcode'])) . '";');
$email = $bugsys->xml->parse($email);
$mail->setSubject($email['email']['subject']['value']);
diff --git a/register.php b/register.php
index 4d516b1..bcb3f45 100755
--- a/register.php
+++ b/register.php
@@ -96,7 +96,7 @@ if ($_POST['do'] == 'insert')
$db->query("INSERT INTO " . TABLE_PREFIX . "useractivation (userid, activator, dateline, usergroupid) VALUES ($userid, '$activationid', " . TIMENOW . ", 2)");
- eval('$email = "' . $template->fetch('email/activateaccount.xml') . '";');
+ eval('$email = "' . $template->fetch(FetchEmailPath('activateaccount.xml', $bugsys->datastore['language'][$bugsys->in['languageid']]['langcode'])) . '";');
$email = $bugsys->xml->parse($email);
$mail->setSubject($email['email']['subject']['value']);
$mail->setBodyText($email['email']['bodyText']['value']);
@@ -110,7 +110,7 @@ if ($_POST['do'] == 'insert')
if ($bugsys->options['sendwelcomemail'])
{
$displayName = $bugsys->in['displayname'];
- eval('$email = "' . $template->fetch('email/welcome.xml') . '";');
+ eval('$email = "' . $template->fetch(FetchEmailPath('welcome.xml', $bugsys->datastore['language'][$bugsys->in['languageid']]['langcode'])) . '";');
$email = $bugsys->xml->parse($email);
$mail->setSubject($email['email']['subject']['value']);
$mail->setBodyText($email['email']['bodyText']['value']);
@@ -172,7 +172,7 @@ if ($_REQUEST['do'] == 'activate')
if ($bugsys->options['sendwelcomemail'])
{
$displayName = $user['displayname'];
- eval('$email = "' . $template->fetch('email/welcome.xml') . '";');
+ eval('$email = "' . $template->fetch(FetchEmailPath('welcome.xml', $bugsys->datastore['language'][$user['languageid']]['langcode'])) . '";');
$email = $bugsys->xml->parse($email);
$mail->setSubject($email['email']['subject']['value']);
$mail->setBodyText($email['email']['bodyText']['value']);
diff --git a/templates/email/accountapproved.xml.tpl b/templates/email/accountapproved.xml.tpl
deleted file mode 100644
index d60908c..0000000
--- a/templates/email/accountapproved.xml.tpl
+++ /dev/null
@@ -1,8 +0,0 @@
-<email>
- <subject>Account Approved at {$bugsys->options['trackertitle']}</subject>
- <bodyText>Hi $user[displayname],
-
-Your account was awaiting moderation at {$bugsys->options['trackertitle']}. Today, an administrator approved your registration and you are now able to use the bug tracker fully.
-
-If you have any questions, please don't hesitate to contact the webmaster.</bodyText>
-</email>
\ No newline at end of file
diff --git a/templates/email/activateaccount.xml.tpl b/templates/email/activateaccount.xml.tpl
deleted file mode 100644
index ae4f98a..0000000
--- a/templates/email/activateaccount.xml.tpl
+++ /dev/null
@@ -1,8 +0,0 @@
-<email>
- <subject>Welcome to {$bugsys->options['trackertitle']}</subject>
- <bodyText>Hi {$bugsys->in['displayname']},
-
-Welcome to the {$bugsys->options['trackertitle']} tracker. Before you can begin posting bug reports, you'll need to activae your account. To do this, please click this link:
-
-{$bugsys->options['trackerurl']}/register.php?do=activate&userid=$userid&activator=$activationid</bodyText>
-</email>
\ No newline at end of file
diff --git a/templates/email/bugnotification.xml.tpl b/templates/email/bugnotification.xml.tpl
deleted file mode 100644
index e301974..0000000
--- a/templates/email/bugnotification.xml.tpl
+++ /dev/null
@@ -1,18 +0,0 @@
-<email>
- <subject>{$this->registry->options['trackertitle']} Bug Notification - {$this->bug['summary']}</subject>
- <bodyText>Hi {$this->users[$userid]['displayname']},
-
-You are receiving this email because you have opted to get notifications for the {$this->registry->options['trackertitle']} bug tracker.
-
-The bug is "{$this->bug['summary']}" (id: {$this->bug['bugid']}) located at {$this->registry->options['trackerurl']}/showreport.php?bugid={$this->bug['bugid']}
-
-Here are the notices:
-###################################################################
-
-$parts
-
-###################################################################
-If you no longer want to receive email from us, please log into your account and click the "My Controls" tab at the top of the screen to change email preferences.
-
-{$this->registry->options['trackerurl']}</bodyText>
-</email>
\ No newline at end of file
diff --git a/templates/email/notice_assigned.part.tpl b/templates/email/notice_assigned.part.tpl
deleted file mode 100644
index b99df20..0000000
--- a/templates/email/notice_assigned.part.tpl
+++ /dev/null
@@ -1 +0,0 @@
-You have been assigned to this bug by $user.
\ No newline at end of file
diff --git a/templates/email/notice_attachment.part.tpl b/templates/email/notice_attachment.part.tpl
deleted file mode 100644
index 53fee41..0000000
--- a/templates/email/notice_attachment.part.tpl
+++ /dev/null
@@ -1,8 +0,0 @@
-$user has uploaded a new attachment:
-============================================
-File name: $attachment[filename]
-Description: $attachment[description]
-File size: $attachment[filesize] Bytes
-Makes obsolete: $obsoletes
-View: {$this->registry->options['trackerurl']}/viewattachment.php?attachmentid=$id
-============================================
\ No newline at end of file
diff --git a/templates/email/notice_comment.part.tpl b/templates/email/notice_comment.part.tpl
deleted file mode 100644
index 49e4c7e..0000000
--- a/templates/email/notice_comment.part.tpl
+++ /dev/null
@@ -1,4 +0,0 @@
-The following comment was added by $user on $date:
-============================================
-$comment[comment]
-============================================
\ No newline at end of file
diff --git a/templates/email/notice_duplicates.part.tpl b/templates/email/notice_duplicates.part.tpl
deleted file mode 100644
index 8841d1a..0000000
--- a/templates/email/notice_duplicates.part.tpl
+++ /dev/null
@@ -1 +0,0 @@
-The duplicates list has changed from "$old" to "$new".
\ No newline at end of file
diff --git a/templates/email/notice_new_bug.part.tpl b/templates/email/notice_new_bug.part.tpl
deleted file mode 100644
index 362ddab..0000000
--- a/templates/email/notice_new_bug.part.tpl
+++ /dev/null
@@ -1,11 +0,0 @@
-This bug has been added to the database:
-============================================
-Bug ID: $bug[bugid]
-Summary: $bug[summary]
-Reporter: $user
-Product/Component/Version: $product
-Initial report:
---------------------------------------------
-$comment[comment]
---------------------------------------------
-============================================
\ No newline at end of file
diff --git a/templates/email/notice_other.part.tpl b/templates/email/notice_other.part.tpl
deleted file mode 100644
index fa73394..0000000
--- a/templates/email/notice_other.part.tpl
+++ /dev/null
@@ -1 +0,0 @@
-The $name field changed from "$old" to "$new".
\ No newline at end of file
diff --git a/templates/email/notice_priority.part.tpl b/templates/email/notice_priority.part.tpl
deleted file mode 100644
index c8294fb..0000000
--- a/templates/email/notice_priority.part.tpl
+++ /dev/null
@@ -1 +0,0 @@
-The priority has been elevatd from "{$this->registry->datastore['priority'][$old]['priority']}" to "{$this->registry->datastore['priority'][$new]['priority']}".
\ No newline at end of file
diff --git a/templates/email/notice_product.part.tpl b/templates/email/notice_product.part.tpl
deleted file mode 100644
index d7038e7..0000000
--- a/templates/email/notice_product.part.tpl
+++ /dev/null
@@ -1 +0,0 @@
-The product, component, and version combination has changed from "$old" to "$new".
\ No newline at end of file
diff --git a/templates/email/notice_resolution.part.tpl b/templates/email/notice_resolution.part.tpl
deleted file mode 100644
index 5ed9152..0000000
--- a/templates/email/notice_resolution.part.tpl
+++ /dev/null
@@ -1 +0,0 @@
-This bug has been resolved with resolution "{$this->registry->datastore['resolution'][$new]['resolution']}", from "{$this->registry->datastore['resolution'][$old]['resolution']}".
\ No newline at end of file
diff --git a/templates/email/notice_severity.part.tpl b/templates/email/notice_severity.part.tpl
deleted file mode 100644
index 4408d92..0000000
--- a/templates/email/notice_severity.part.tpl
+++ /dev/null
@@ -1 +0,0 @@
-The severity has been elevated from "{$this->registry->datastore['severity'][$old]['severity']}" to "{$this->registry->datastore['severity'][$new]['severity']}".
\ No newline at end of file
diff --git a/templates/email/notice_status.part.tpl b/templates/email/notice_status.part.tpl
deleted file mode 100644
index 6115362..0000000
--- a/templates/email/notice_status.part.tpl
+++ /dev/null
@@ -1 +0,0 @@
-The status of the bug is now "{$this->registry->datastore['status'][$new]['status']}", from "{$this->registry->datastore['status'][$old]['status']}".
\ No newline at end of file
diff --git a/templates/email/notice_unassigned.part.tpl b/templates/email/notice_unassigned.part.tpl
deleted file mode 100644
index 72c9917..0000000
--- a/templates/email/notice_unassigned.part.tpl
+++ /dev/null
@@ -1 +0,0 @@
-You are no longer assigned to this bug, per $user's changes.
\ No newline at end of file
diff --git a/templates/email/passwordreset.xml.tpl b/templates/email/passwordreset.xml.tpl
deleted file mode 100644
index eab2f01..0000000
--- a/templates/email/passwordreset.xml.tpl
+++ /dev/null
@@ -1,10 +0,0 @@
-<email>
- <subject>{$bugsys->options['trackertitle']} Password Reset</subject>
- <bodyText>Hi {$user->objdata['displayname']},
-
-You requested this lost password email at the {$bugsys->options['trackertitle']} bug tracker. To reset your password, simply click the link below (or paste it into your browser window exactly) and enter a new password.
-
-{$bugsys->options['trackerurl']}/login.php?do=recoverpw&activator=$activator
-
-If you did not request this, do not worry as this notice will expire in 24 hours.</bodyText>
-</email>
\ No newline at end of file
diff --git a/templates/email/welcome.xml.tpl b/templates/email/welcome.xml.tpl
deleted file mode 100644
index 494779a..0000000
--- a/templates/email/welcome.xml.tpl
+++ /dev/null
@@ -1,8 +0,0 @@
-<email>
- <subject>Welcome to {$bugsys->options['trackertitle']}</subject>
- <bodyText>Hi {$displayName},
-
-Thank you for taking the time to register at {$bugsys->options['trackertitle']}. We look forward to your contributations to making our products better.
-
-If you have any questions, please don't hesitate to contact the webmaster.</bodyText>
-</email>
\ No newline at end of file