Thijs/wiki.techinc.nl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "Add user preference info to basic info section"

Browse source
This commit is contained in:
jenkins-bot 2019-12-18 00:28:53 +00:00 committed by Gerrit Code Review
commit 26a13a686e
3 changed files with 7 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
includes/preferences/DefaultPreferencesFactory.php
View file

@ -413,6 +413,11 @@ class DefaultPreferencesFactory implements PreferencesFactory {
'label' => $context->msg( 'prefs-resetpass' )->text(),
] ),
'label-message' => 'yourpassword',
// email password reset feature only works for users that have an email set up
'help' => $this->options->get( 'AllowRequiringEmailForResets' ) && $user->getEmail()
? $context->msg( 'prefs-help-yourpassword',
'[[#mw-prefsection-personal-email|{{int:prefs-email}}]]' )->parse()
: '',
'section' => 'personal/info',
];
}

1
languages/i18n/en.json
View file

@ -404,6 +404,7 @@
"createacct-another-username-ph": "Enter the username",
"createacct-helpusername": "",
"yourpassword": "Password:",
"prefs-help-yourpassword": "Account recovery is enabled. See $1 for more settings.",
"userlogin-yourpassword": "Password",
"userlogin-yourpassword-ph": "Enter your password",
"createacct-yourpassword-ph": "Enter a password",

1
languages/i18n/qqq.json
View file

@ -617,6 +617,7 @@
"createacct-another-username-ph": "Placeholder text in create account form field when one user creates an account for another.",
"createacct-helpusername": "{{Optional}} Optional message in new create account form providing guidance for username.\n\nBlank by default.",
"yourpassword": "In user preferences\n\n{{Identical|Password}}",
"prefs-help-yourpassword": "Used in [[Special:Preferences]], tab \"User profile\". Parameters:\n* $1 - is the link to [[#mw-prefsection-personal-email|{{int:prefs-email}}]] section.",
"userlogin-yourpassword": "In login & create account forms, label for password field.\n\nSee examples: [[Special:UserLogin]] and [{{canonicalurl:Special:UserLogin|type=signup}} Special:UserLogin?type=signup]\n{{Identical|Password}}",
"userlogin-yourpassword-ph": "Placeholder text in login form for password field.\n\nSee examples: [[Special:UserLogin]] and [{{canonicalurl:Special:UserLogin|type=signup}} Special:UserLogin?type=signup]\n{{Identical|Enter password}}",
"createacct-yourpassword-ph": "Placeholder text in create account form for password field.\n\nSee example: [{{canonicalurl:Special:UserLogin|type=signup}} Special:UserLogin?type=signup]\n{{Identical|Enter password}}",