diff options
Diffstat (limited to 'template/en/default/email')
| -rw-r--r-- | template/en/default/email/bugmail-common.txt.tmpl | 3 | ||||
| -rw-r--r-- | template/en/default/email/bugmail-header.txt.tmpl | 2 | ||||
| -rw-r--r-- | template/en/default/email/bugmail.html.tmpl | 2 | ||||
| -rw-r--r-- | template/en/default/email/lockout.txt.tmpl | 2 | ||||
| -rw-r--r-- | template/en/default/email/new-api-key.txt.tmpl | 5 | ||||
| -rw-r--r-- | template/en/default/email/sudo.txt.tmpl | 6 | ||||
| -rw-r--r-- | template/en/default/email/whine.txt.tmpl | 4 |
7 files changed, 10 insertions, 14 deletions
diff --git a/template/en/default/email/bugmail-common.txt.tmpl b/template/en/default/email/bugmail-common.txt.tmpl index b6cadaf11..e65378b60 100644 --- a/template/en/default/email/bugmail-common.txt.tmpl +++ b/template/en/default/email/bugmail-common.txt.tmpl @@ -16,7 +16,7 @@ # # Contributor(s): Guy Pyrzak <guy.pyrzak@gmail.com> #%] - + [% PROCESS "global/field-descs.none.tmpl" %] [% field_label = field_descs.${change.field_name} %] @@ -35,4 +35,3 @@ [% IF change.field_name == 'longdescs.isprivate' %] [% field_label = field_label.replace('^(Comment )?', "Comment #${change.num} ") %] [% END %] -
\ No newline at end of file diff --git a/template/en/default/email/bugmail-header.txt.tmpl b/template/en/default/email/bugmail-header.txt.tmpl index 679e705cd..b1a440e03 100644 --- a/template/en/default/email/bugmail-header.txt.tmpl +++ b/template/en/default/email/bugmail-header.txt.tmpl @@ -19,7 +19,7 @@ # Frédéric Buclin <LpSolit@gmail.com> # Guy Pyrzak <guy.pyrzak@gmail.com> #%] - + [% PROCESS "global/field-descs.none.tmpl" %] [% PROCESS "global/reason-descs.none.tmpl" %] [% isnew = bug.lastdiffed ? 0 : 1 %] diff --git a/template/en/default/email/bugmail.html.tmpl b/template/en/default/email/bugmail.html.tmpl index 8b567b691..51a862d37 100644 --- a/template/en/default/email/bugmail.html.tmpl +++ b/template/en/default/email/bugmail.html.tmpl @@ -16,7 +16,7 @@ # # Contributor(s): Guy Pyrzak <guy.pyrzak@gmail.com> #%] - + [% PROCESS "global/field-descs.none.tmpl" %] [% PROCESS "global/reason-descs.none.tmpl" %] diff --git a/template/en/default/email/lockout.txt.tmpl b/template/en/default/email/lockout.txt.tmpl index 94e9c74cb..ff40011b3 100644 --- a/template/en/default/email/lockout.txt.tmpl +++ b/template/en/default/email/lockout.txt.tmpl @@ -27,7 +27,7 @@ X-Bugzilla-Type: admin The address [% address %] failed too many login attempts ( [%- constants.MAX_LOGIN_ATTEMPTS +%]) for -the account [% locked_user.login %]. +the account [% locked_user.login %]. The login attempts occurred at these times: diff --git a/template/en/default/email/new-api-key.txt.tmpl b/template/en/default/email/new-api-key.txt.tmpl index aed904def..9ab13d90b 100644 --- a/template/en/default/email/new-api-key.txt.tmpl +++ b/template/en/default/email/new-api-key.txt.tmpl @@ -26,10 +26,7 @@ or update the key at the following URL: [%+ urlbase %]userprefs.cgi?tab=apikey -[% IF new_key.app_id == Param('mozreview_app_id') %] -This API key was automatically created by MozReview. If you did not recently log in to -MozReview, please disable the key at the above URL, and change your password immediately. -[% ELSIF new_key.app_id == Param('phabricator_app_id') %] +[% IF new_key.app_id == Param('phabricator_app_id') %] This API key was automatically created by Mozilla's Phabricator instance. If you did not recently log in to Phabricator, please disable the key at the above URL, and change your password immediately. [% ELSE %] diff --git a/template/en/default/email/sudo.txt.tmpl b/template/en/default/email/sudo.txt.tmpl index 74fbc4976..9e1290ac9 100644 --- a/template/en/default/email/sudo.txt.tmpl +++ b/template/en/default/email/sudo.txt.tmpl @@ -27,7 +27,7 @@ Subject: [[% terms.Bugzilla %]] Your account [% user.login -%] is being impersonated X-Bugzilla-Type: admin - [%+ sudoer.identity %] has used the 'sudo' feature to access + [%+ sudoer.identity %] has used the 'sudo' feature to access [%+ terms.Bugzilla %] using your account. [% IF reason %] @@ -38,6 +38,6 @@ X-Bugzilla-Type: admin [%+ sudoer.identity %] did not provide a reason for doing this. [% END %] - If you feel that this action was inappropriate, please contact -[%+ Param("maintainer") %]. For more information on this feature, + If you feel that this action was inappropriate, please contact +[%+ Param("maintainer") %]. For more information on this feature, visit <[% urlbase %]page.cgi?id=sudo.html>. diff --git a/template/en/default/email/whine.txt.tmpl b/template/en/default/email/whine.txt.tmpl index 32d8da8a0..b29bef663 100644 --- a/template/en/default/email/whine.txt.tmpl +++ b/template/en/default/email/whine.txt.tmpl @@ -26,7 +26,7 @@ X-Bugzilla-Type: whine [This e-mail has been automatically generated.] -You have one or more [% terms.bugs %] assigned to you in the [% terms.Bugzilla %] +You have one or more [% terms.bugs %] assigned to you in the [% terms.Bugzilla %] [% terms.bug %] tracking system ([% urlbase %]) that require attention. @@ -50,7 +50,7 @@ it if you like!): [% urlbase %]buglist.cgi?bug_status=CONFIRMED&assigned_to=[% email %] -Or, you can use the general query page, at +Or, you can use the general query page, at [%+ urlbase %]query.cgi Appended below are the individual URLs to get to all of your [% display_value("bug_status", "CONFIRMED") %] [%+ terms.bugs %] |