Bug 100089: Templatise "passwordmail" email

Patch by Emmanuel Seyman <eseyman@linagora.com>; r=lpsolit; a=justdave

2 files changed, 35 insertions, 7 deletions

diff --git a/template/en/default/admin/params/mta.html.tmpl b/template/en/default/admin/params/mta.html.tmpl
index 37d1d8e86..cb2454d62 100644
--- a/template/en/default/admin/params/mta.html.tmpl
+++ b/template/en/default/admin/params/mta.html.tmpl
@@ -54,13 +54,6 @@
 
   smtpserver => "The SMTP server address (if using SMTP for mail delivery).",
 
-  passwordmail => "The email that gets sent to people to tell them their password. " _
-                  "Within this text, %mailaddress% gets replaced by the person's " _
-                  "email address, %login% gets replaced by the person's login " _
-                  "(usually the same thing), and %password% gets replaced by their " _
-                  "password. %<i>anythingelse</i>% gets replaced by the " _
-                  "definition of that parameter (as defined on this page).",
-
   newchangedmail => "The email that gets sent to people when a $terms.bug changes. Within " _
                     "this text, %to% gets replaced with the e-mail address of the " _
                     "person receiving the mail. %bugid% gets replaced by the $terms.bug " _
diff --git a/template/en/default/email/password.txt.tmpl b/template/en/default/email/password.txt.tmpl
new file mode 100644
index 000000000..5993a90f5
--- /dev/null
+++ b/template/en/default/email/password.txt.tmpl
@@ -0,0 +1,35 @@
+[%# 1.0@bugzilla.org %]
+[%# The contents of this file are subject to the Mozilla Public
+  # License Version 1.1 (the "License"); you may not use this file
+  # except in compliance with the License. You may obtain a copy of
+  # the License at http://www.mozilla.org/MPL/
+  #
+  # Software distributed under the License is distributed on an "AS
+  # IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+  # implied. See the License for the specific language governing
+  # rights and limitations under the License.
+  #
+  # The Original Code is the Bugzilla Bug Tracking System.
+  #
+  # The Initial Developer of the Original Code is Netscape Communications
+  # Corporation. Portions created by Netscape are
+  # Copyright (C) 1998 Netscape Communications Corporation. All
+  # Rights Reserved.
+  #
+  # Contributor(s): Emmanuel Seyman <eseyman@linagora.com>
+  #%]
+
+[% PROCESS global/variables.none.tmpl %]
+
+From: bugzilla-daemon
+To: [% mailaddress %]
+Subject: Your [% terms.Bugzilla %] password.
+
+To use the wonders of [% terms.Bugzilla %], you can use the following:
+
+ E-mail address:  [% login %]
+       Password:  [% password %]
+
+ To change your password, go to:
+ [%+ Param("urlbase") %]userprefs.cgi
+