From ce9066eab882827f5f58417a32de343c6a54d296 Mon Sep 17 00:00:00 2001 From: "lpsolit%gmail.com" <> Date: Wed, 31 Aug 2005 07:43:04 +0000 Subject: Bug 30345: Can mark bugs duplicates of each other [dupe loops] - Patch by Frédéric Buclin r/a=myk MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- template/en/default/global/user-error.html.tmpl | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) (limited to 'template/en') 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" %] -- cgit v1.2.3-24-g4f1b