summaryrefslogtreecommitdiffstats
path: root/template/en/default
diff options
context:
space:
mode:
authorByron Jones <bjones@mozilla.com>2013-02-07 08:03:00 +0100
committerByron Jones <bjones@mozilla.com>2013-02-07 08:03:00 +0100
commit275eb1b39a25ef88f47fa5b592c9cf02ad9f754d (patch)
tree0104e2d11a3e7ecac5c8901a3e3bafe01763dff9 /template/en/default
parent87badf1db52d0f54fd83a940fb4a884b56e159ff (diff)
downloadbugzilla-275eb1b39a25ef88f47fa5b592c9cf02ad9f754d.tar.gz
bugzilla-275eb1b39a25ef88f47fa5b592c9cf02ad9f754d.tar.xz
Bug 784352: Show a warning when interdiff reports errors
r=dkl, a=LpSolit
Diffstat (limited to 'template/en/default')
-rw-r--r--template/en/default/attachment/diff-header.html.tmpl19
1 files changed, 11 insertions, 8 deletions
diff --git a/template/en/default/attachment/diff-header.html.tmpl b/template/en/default/attachment/diff-header.html.tmpl
index ed4d44e25..4261c8423 100644
--- a/template/en/default/attachment/diff-header.html.tmpl
+++ b/template/en/default/attachment/diff-header.html.tmpl
@@ -119,15 +119,18 @@ Interdiff of #[% oldid %] and #[% newid %] for [% terms.bug %] #[% bugid %]
[% END %]
[% IF warning %]
-<h2 class="warning">Warning:
+<h2 class="warning">
+ Warning:
[% IF warning == "interdiff1" %]
- this difference between two patches may show things in the wrong places due
- to a limitation in [% terms.Bugzilla %] when comparing patches with different
- sets of files.
- [% END %]
- [% IF warning == "interdiff2" %]
- this difference between two patches may be inaccurate due to a limitation in
- [%+ terms.Bugzilla %] when comparing patches made against different revisions.
+ this difference between two patches may show things in the wrong places due
+ to a limitation in [% terms.Bugzilla %] when comparing patches with
+ different sets of files.
+ [% ELSIF warning == "interdiff2" %]
+ this difference between two patches may be inaccurate due to a limitation
+ in [%+ terms.Bugzilla %] when comparing patches made against different
+ revisions.
+ [% ELSIF warning == "interdiff3" %]
+ interdiff encountered errors while comparing these patches.
[% END %]
</h2>
[% ELSE %]