01tonythomas has uploaded a new change for review.
https://gerrit.wikimedia.org/r/125762
Change subject: Moved "Email options" preference to separate "Notifications"
tab.
......................................................................
Moved "Email options" preference to separate "Notifications" tab.
This will allow third-party extensions (such as Echo) to more easily
add their preferences to a dedicated, sensible section of
Special:Preferences.
Bug: 63577
Change-Id: I3b636f3f9fc6f3f69713e470de272f0c0d099e1a
---
M includes/Preferences.php
M languages/i18n/en.json
M languages/i18n/qqq.json
3 files changed, 11 insertions(+), 8 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/62/125762/1
diff --git a/includes/Preferences.php b/includes/Preferences.php
index 1825cce..d86ad43 100644
--- a/includes/Preferences.php
+++ b/includes/Preferences.php
@@ -433,6 +433,7 @@
);
## Email stuff
+ //Moved to new 'Notifications' preference tab
if ( $wgEnableEmail ) {
if ( $canViewPrivateInfo ) {
@@ -464,7 +465,7 @@
'raw' => true,
'default' => $emailAddress,
'label-message' => 'youremail',
- 'section' => 'personal/email',
+ 'section' => 'notifications/email',
'help-messages' => $helpMessages,
# 'cssclass' chosen below
);
@@ -507,7 +508,7 @@
$defaultPreferences['emailauthentication'] = array(
'type' => 'info',
'raw' => true,
- 'section' => 'personal/email',
+ 'section' =>
'notifications/email',
'label-message' =>
'prefs-emailconfirm-label',
'default' =>
$emailauthenticated,
# Apply the same CSS class used
on the input to the message:
@@ -521,13 +522,13 @@
$defaultPreferences['disablemail'] = array(
'type' => 'toggle',
'invert' => true,
- 'section' => 'personal/email',
+ 'section' => 'notifications/email',
'label-message' => 'allowemail',
'disabled' => $disableEmailPrefs,
);
$defaultPreferences['ccmeonemails'] = array(
'type' => 'toggle',
- 'section' => 'personal/email',
+ 'section' => 'notifications/email',
'label-message' => 'tog-ccmeonemails',
'disabled' => $disableEmailPrefs,
);
@@ -536,7 +537,7 @@
if ( $wgEnotifWatchlist ) {
$defaultPreferences['enotifwatchlistpages'] =
array(
'type' => 'toggle',
- 'section' => 'personal/email',
+ 'section' => 'notifications/email',
'label-message' =>
'tog-enotifwatchlistpages',
'disabled' => $disableEmailPrefs,
);
@@ -544,7 +545,7 @@
if ( $wgEnotifUserTalk ) {
$defaultPreferences['enotifusertalkpages'] =
array(
'type' => 'toggle',
- 'section' => 'personal/email',
+ 'section' => 'notifications/email',
'label-message' =>
'tog-enotifusertalkpages',
'disabled' => $disableEmailPrefs,
);
@@ -552,7 +553,7 @@
if ( $wgEnotifUserTalk || $wgEnotifWatchlist ) {
$defaultPreferences['enotifminoredits'] = array(
'type' => 'toggle',
- 'section' => 'personal/email',
+ 'section' => 'notifications/email',
'label-message' =>
'tog-enotifminoredits',
'disabled' => $disableEmailPrefs,
);
@@ -560,7 +561,7 @@
if ( $wgEnotifRevealEditorAddress ) {
$defaultPreferences['enotifrevealaddr']
= array(
'type' => 'toggle',
- 'section' => 'personal/email',
+ 'section' =>
'notifications/email',
'label-message' =>
'tog-enotifrevealaddr',
'disabled' =>
$disableEmailPrefs,
);
diff --git a/languages/i18n/en.json b/languages/i18n/en.json
index 41c12b3..8ec66a5 100644
--- a/languages/i18n/en.json
+++ b/languages/i18n/en.json
@@ -935,6 +935,7 @@
"prefs-labs": "Labs features",
"prefs-user-pages": "User pages",
"prefs-personal": "User profile",
+ "prefs-notifications": "Notifications",
"prefs-rc": "Recent changes",
"prefs-watchlist": "Watchlist",
"prefs-watchlist-days": "Days to show in watchlist:",
diff --git a/languages/i18n/qqq.json b/languages/i18n/qqq.json
index 8d25d9e..d728f80 100644
--- a/languages/i18n/qqq.json
+++ b/languages/i18n/qqq.json
@@ -1097,6 +1097,7 @@
"prefs-labs": "Header of a subsection at [[Special:Preferences]], tab
''{{int:prefs-editing}}'', listing features that are experimental",
"prefs-user-pages": "Header of a subsection at [[Special:Preferences]],
tab ''{{int:prefs-misc}}'', listing features that are related to user pages",
"prefs-personal": "Title of a tab in
[[Special:Preferences]].\n{{Identical|User profile}}",
+ "prefs-notifications": "Title of a tab in [[Special:Preferences]].",
"prefs-rc": "Used in user preferences.\n\n{{Identical|Recent changes}}",
"prefs-watchlist": "Used in user preferences.\n{{Identical|Watchlist}}",
"prefs-watchlist-days": "Used in [[Special:Preferences]], tab
\"Watchlist\".",
--
To view, visit https://gerrit.wikimedia.org/r/125762
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I3b636f3f9fc6f3f69713e470de272f0c0d099e1a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: 01tonythomas <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
