From 275eb1b39a25ef88f47fa5b592c9cf02ad9f754d Mon Sep 17 00:00:00 2001 From: Byron Jones Date: Thu, 7 Feb 2013 15:03:00 +0800 Subject: Bug 784352: Show a warning when interdiff reports errors r=dkl, a=LpSolit --- template/en/default/attachment/diff-header.html.tmpl | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) (limited to 'template/en/default/attachment/diff-header.html.tmpl') 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 %] -

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 %]

[% ELSE %] -- cgit v1.2.3-24-g4f1b