summaryrefslogtreecommitdiffstats
path: root/template/en/default/global
diff options
context:
space:
mode:
authortimeless%mozdev.org <>2007-07-30 14:46:25 +0200
committertimeless%mozdev.org <>2007-07-30 14:46:25 +0200
commitf58650e43e01119d30be25befd275f4d4f380a97 (patch)
tree7daeb36067cae49655f90a543a8a92f87372ce39 /template/en/default/global
parentb3a5340afc6d1411275f5548db1e36e655aeb755 (diff)
downloadbugzilla-f58650e43e01119d30be25befd275f4d4f380a97.tar.gz
bugzilla-f58650e43e01119d30be25befd275f4d4f380a97.tar.xz
Bug 388826 "cannot make a conclusive match" should not be said if the only reason is confirmuniqueusermatch
r=wicked a=lpsolit
Diffstat (limited to 'template/en/default/global')
-rw-r--r--template/en/default/global/confirm-user-match.html.tmpl17
1 files changed, 12 insertions, 5 deletions
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 @@
>
<p>
- [% terms.Bugzilla %] cannot make a conclusive match for one or more of the
- names and/or email addresses you entered on the previous page.<br>
- 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.
+ <br>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.
+ <br>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.
</p>
[% ELSE %]
[% PROCESS global/header.html.tmpl title="Match Failed" %]