From f58650e43e01119d30be25befd275f4d4f380a97 Mon Sep 17 00:00:00 2001 From: "timeless%mozdev.org" <> Date: Mon, 30 Jul 2007 12:46:25 +0000 Subject: Bug 388826 "cannot make a conclusive match" should not be said if the only reason is confirmuniqueusermatch r=wicked a=lpsolit --- template/en/default/global/confirm-user-match.html.tmpl | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) (limited to 'template/en/default/global/confirm-user-match.html.tmpl') diff --git a/template/en/default/global/confirm-user-match.html.tmpl b/template/en/default/global/confirm-user-match.html.tmpl index 38ac8dd59..a4260c5af 100644 --- a/template/en/default/global/confirm-user-match.html.tmpl +++ b/template/en/default/global/confirm-user-match.html.tmpl @@ -54,11 +54,18 @@ >
- [% terms.Bugzilla %] cannot make a conclusive match for one or more of the
- names and/or email addresses you entered on the previous page.
- Please examine the lists of potential matches below and select the
- one you want, or go back to the previous page to revise the names
- you entered.
+ [% IF matchmultiple %]
+ [% terms.Bugzilla %] cannot make a conclusive match for one or more
+ of the names and/or email addresses you entered on the previous page.
+
Please examine the lists of potential matches below and select the
+ ones you want,
+ [% ELSE %]
+ [% terms.Bugzilla %] is configured to require verification whenever
+ you enter a name or partial email address.
+
Below are the names/addresses you entered and the matched accounts.
+ Please confirm that they are correct,
+ [% END %]
+ or go back to the previous page to revise the names you entered.