Dzahn has submitted this change and it was merged. Change subject: [4.4] Upgrade "Login"/"Email address" string to use upstream code ......................................................................
[4.4] Upgrade "Login"/"Email address" string to use upstream code DO NOT COMMIT until Bugzilla has been upgraded to 4.4. Kill our custom hack to display "Email address" instead of the confusing "login". This is a backport of 4.5 code in http://bzr.mozilla.org/bugzilla/trunk/revision/8686 Change-Id: Ida6429cc3d7c38265a200573a5aaebf093464417 --- M template/en/custom/account/auth/login.html.tmpl 1 file changed, 18 insertions(+), 2 deletions(-) Approvals: Dzahn: Verified; Looks good to me, approved diff --git a/template/en/custom/account/auth/login.html.tmpl b/template/en/custom/account/auth/login.html.tmpl index 1bc815f..bd100cc 100644 --- a/template/en/custom/account/auth/login.html.tmpl +++ b/template/en/custom/account/auth/login.html.tmpl @@ -37,14 +37,22 @@ [% USE Bugzilla %] <p> - I need a legitimate login and password to continue. + [% terms.Bugzilla %] needs a legitimate login and password to continue. </p> <form name="login" action="[% target FILTER html %]" method="POST" [%- IF Bugzilla.cgi.param("data") %] enctype="multipart/form-data"[% END %]> <table> <tr> - <th align="right"><label for="Bugzilla_login">Email address:</label></th> + <th> + <label for="Bugzilla_login"> + [% IF Param('emailsuffix') %] + Login: + [% ELSE %] + Your Email Address: + [% END %] + </label> + </th> <td> <input size="35" id="Bugzilla_login" name="Bugzilla_login"> [% Param('emailsuffix') FILTER html %] @@ -103,6 +111,14 @@ <p> If you don't have a [% terms.Bugzilla %] account, you can <a href="createaccount.cgi">create a new account</a>. + [% IF Param("requirelogin") %] + A user account is required because this [% terms.Bugzilla %] + installation is only accessible to authenticated users. + [% ELSIF target.match("_bug\.cgi$") %] + A user account is required to file a new [% terms.bug %] or to comment + into existing ones so that you can be contacted if more information is + needed. + [% END %] </p> [% END %] -- To view, visit https://gerrit.wikimedia.org/r/98008 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ida6429cc3d7c38265a200573a5aaebf093464417 Gerrit-PatchSet: 2 Gerrit-Project: wikimedia/bugzilla/modifications Gerrit-Branch: master Gerrit-Owner: Aklapper <aklap...@wikimedia.org> Gerrit-Reviewer: Dzahn <dz...@wikimedia.org> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
