summaryrefslogtreecommitdiffstats
path: root/template/en/default
diff options
context:
space:
mode:
authorlpsolit%gmail.com <>2005-08-31 09:43:04 +0200
committerlpsolit%gmail.com <>2005-08-31 09:43:04 +0200
commitce9066eab882827f5f58417a32de343c6a54d296 (patch)
treef4775f98f29e9e03ade3b68c8d452c1a6bdca90e /template/en/default
parent5fbf48df3df4d8be8637e85467fe6423ed7f1ed1 (diff)
downloadbugzilla-ce9066eab882827f5f58417a32de343c6a54d296.tar.gz
bugzilla-ce9066eab882827f5f58417a32de343c6a54d296.tar.xz
Bug 30345: Can mark bugs duplicates of each other [dupe loops] - Patch by Frédéric Buclin <LpSolit@gmail.com> r/a=myk
Diffstat (limited to 'template/en/default')
-rw-r--r--template/en/default/global/user-error.html.tmpl18
1 files changed, 15 insertions, 3 deletions
diff --git a/template/en/default/global/user-error.html.tmpl b/template/en/default/global/user-error.html.tmpl
index e7798b068..3e1a2a3ef 100644
--- a/template/en/default/global/user-error.html.tmpl
+++ b/template/en/default/global/user-error.html.tmpl
@@ -336,9 +336,21 @@
This [% terms.bug %] has already been marked as a duplicate
of [% terms.bug %] [%+ dupe_of FILTER html %].
- [% ELSIF error == "dupe_of_self_disallowed" %]
- [% title = "Cannot mark $terms.abug as a duplicate of itself" %]
- You can't mark [% terms.abug %] as a duplicate of itself.
+ [% ELSIF error == "dupe_not_allowed" %]
+ [% title = "Cannot mark $terms.bugs as duplicates" %]
+ You cannot mark [% terms.bugs %] as duplicates when
+ changing several [% terms.bugs %] at once.
+
+ [% ELSIF error == "dupe_loop_detected" %]
+ [% title = "Loop detected among duplicates" %]
+ You cannot mark [% terms.bug %] [%+ bug_id FILTER html %] as
+ a duplicate of
+ [% IF dupe_of == bug_id %]
+ itself
+ [% ELSE %]
+ [%+ terms.bug %] [%+ dupe_of FILTER html %], because it
+ would create a duplicate loop
+ [% END %].
[% ELSIF error == "email_change_in_progress" %]
[% title = "Email Change Already In Progress" %]