summaryrefslogtreecommitdiffstats
path: root/template/en
diff options
context:
space:
mode:
authorByron Jones <bjones@mozilla.com>2013-01-30 07:50:10 +0100
committerByron Jones <bjones@mozilla.com>2013-01-30 07:50:10 +0100
commitd816479d7c4f57e2a7891de104d46732d2e3066c (patch)
tree69ef326e8e5edade9b6313d564732e59059290b9 /template/en
parent8b73404cfb2f2711c5d30b096d9758c79acb9d4a (diff)
downloadbugzilla-d816479d7c4f57e2a7891de104d46732d2e3066c.tar.gz
bugzilla-d816479d7c4f57e2a7891de104d46732d2e3066c.tar.xz
Bug 784352: show a warning when interdiff reports errors
Diffstat (limited to 'template/en')
-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 c13b2e7ba..8cb5525f7 100644
--- a/template/en/default/attachment/diff-header.html.tmpl
+++ b/template/en/default/attachment/diff-header.html.tmpl
@@ -133,15 +133,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 %]