Page MenuHomePhabricator
Files F6354

bug22457_patch.diff
Public
Actions

Authored By
• bzimport
Nov 21 2014, 10:55 PM
Size
2 KB
Referenced Files
None
Subscribers
None

bug22457_patch.diff
View Options

Index: maintenance/language/messages.inc
===================================================================
--- maintenance/language/messages.inc (revision 106166)
+++ maintenance/language/messages.inc (working copy)
@@ -422,6 +422,7 @@
'yourpassword',
'yourpasswordagain',
'remembermypassword',
+ 'byemail-explanation',
'securelogin-stick-https',
'yourdomainname',
'externaldberror',
Index: skins/common/shared.css
===================================================================
--- skins/common/shared.css (revision 106166)
+++ skins/common/shared.css (working copy)
@@ -236,7 +236,9 @@
td.mw-submit {
white-space: nowrap;
}
-
+.byemailtip{
+ white-space: pre-line;
+}
table.mw-htmlform-nolabel td.mw-label {
width: 0 !important;
}
Index: includes/templates/Userlogin.php
===================================================================
--- includes/templates/Userlogin.php (revision 106166)
+++ includes/templates/Userlogin.php (working copy)
@@ -370,6 +370,9 @@
tabindex="<?php echo $tabIndex++; ?>"
value="<?php $this->msg('createaccountmail') ?>" />
<?php } ?>
+ <span class="prefsectiontip byemailtip" >
+ <?php $this->msgWiki('byemail-explanation'); ?>
+ </span>
</td>
</tr>
</table>
Index: languages/messages/MessagesQqq.php
===================================================================
--- languages/messages/MessagesQqq.php (revision 106166)
+++ languages/messages/MessagesQqq.php (working copy)
@@ -677,7 +677,8 @@
# Login and logout pages
'logouttext' => 'Log out message',
'welcomecreation' => 'The welcome message users see after registering a user account. $1 is the username of the new user.',
-'yourname' => "In user preferences
+'yourname' => "In user preferences,
+'byemail-explanation', => 'Explains that clicking By E-mail sends a random password to the account that can be changed on login. In [[Special:UserLogin]]'
<nowiki>{{</nowiki>[[Gender|GENDER]]<nowiki>}}</nowiki> is '''NOT''' supported.
Index: languages/messages/MessagesEn.php
===================================================================
--- languages/messages/MessagesEn.php (revision 106166)
+++ languages/messages/MessagesEn.php (working copy)
@@ -1044,6 +1044,7 @@
'yourpassword' => 'Password:',
'yourpasswordagain' => 'Retype password:',
'remembermypassword' => 'Remember my login on this browser (for a maximum of $1 {{PLURAL:$1|day|days}})',
+'byemail-explanation' => 'Clicking By E-mail will send an an auto-generated password to the provided email that can be reset after that new user logs in',
'securelogin-stick-https' => 'Stay connected to HTTPS after login',
'yourdomainname' => 'Your domain:',
'externaldberror' => 'There was either an authentication database error or you are not allowed to update your external account.',

File Metadata

Mime Type
text/x-diff
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
5898
Default Alt Text
bug22457_patch.diff (2 KB)

Event Timeline

Content licensed under Creative Commons Attribution-ShareAlike (CC BY-SA) 4.0 unless otherwise noted; code licensed under GNU General Public License (GPL) 2.0 or later and other open source licenses. By using this site, you agree to the Terms of Use, Privacy Policy, and Code of Conduct. · Wikimedia Foundation · Privacy Policy · Code of Conduct · Terms of Use · Disclaimer · CC-BY-SA · GPL