jenkins-bot has submitted this change and it was merged.
Change subject: New presentation of email notification settings per requirements
......................................................................
New presentation of email notification settings per requirements
We have a new shorter header and add labels for the two options.
Change-Id: If63720afe35f2edfa90b2c74d93fe355abd5da61
---
M Echo.i18n.php
M Hooks.php
2 files changed, 13 insertions(+), 10 deletions(-)
Approvals:
Matthias Mullie: Looks good to me, approved
jenkins-bot: Verified
diff --git a/Echo.i18n.php b/Echo.i18n.php
index 92d1ab3..3154761 100644
--- a/Echo.i18n.php
+++ b/Echo.i18n.php
@@ -13,9 +13,11 @@
// Preferences
'prefs-echo' => 'Notifications',
+ 'prefs-emailsettings' => 'Email settings',
'prefs-displaynotifications' => 'Display options',
- 'prefs-emailfrequency' => 'When would you like to receive email
notifications?',
'prefs-echosubscriptions' => 'Notify me about these events',
+ 'echo-pref-send-me' => 'Send me:',
+ 'echo-pref-send-to' => 'Send to:',
'echo-pref-web' => 'Web',
'echo-pref-email' => 'Email',
'echo-pref-email-frequency-never' => 'Do not send me any email
notifications',
@@ -196,13 +198,15 @@
'echo-desc' =>
'{{desc|name=Echo|url=http://www.mediawiki.org/wiki/Extension:Echo}}',
'prefs-echo' => 'Name of preferences section for Echo notifications.
{{Identical|Notification}}',
+ 'prefs-emailsettings' => 'Header for the section of preferences that
deals with how often notification emails are sent out and what address they are
sent to',
'prefs-displaynotifications' => 'Header for the section of preferences
that deals with how notifications are displayed',
- 'prefs-emailfrequency' => 'Header for the section of preferences that
deals with how often notification emails are sent out
+ 'prefs-echosubscriptions' => 'Header for the section of preferences
that deals with which notifications the user receives',
+ 'echo-pref-send-me' => 'Label for the following email delivery options:
* {{msg-mw|Echo-pref-email-frequency-never}}
-* {{msg-mw|Echo-pref-email-frequency-immediately}}
+* {{msg-mw|Echo-pref-email-frequency-immediately}} (default)
* {{msg-mw|Echo-pref-email-frequency-daily}}
* {{msg-mw|Echo-pref-email-frequency-weekly}}',
- 'prefs-echosubscriptions' => 'Header for the section of preferences
that deals with which notifications the user receives',
+ 'echo-pref-send-to' => "Label for the address to send email
notifications to.",
'echo-pref-web' => 'Label for list of notifications which are delivered
on the web. In other words, on the wiki itself rather by email or another
method. This should be kept very short.',
'echo-pref-email' => 'Label for list of notifications which are
delivered via email. This should be kept very short.',
'echo-pref-email-frequency-never' => "Option for users who don't want
to receive any email notifications
diff --git a/Hooks.php b/Hooks.php
index d054b63..3b47fcb 100644
--- a/Hooks.php
+++ b/Hooks.php
@@ -276,8 +276,8 @@
}
$preferences['echo-email-frequency'] = array(
'type' => 'select',
- //'label-message' => 'echo-pref-email-frequency',
- 'section' => 'echo/emailfrequency',
+ 'label-message' => 'echo-pref-send-me',
+ 'section' => 'echo/emailsettings',
'options' => $freqOptions
);
@@ -298,13 +298,12 @@
. wfMessage( 'parentheses'
)->rawParams( $link )->escaped();
}
}
- $emailContent = wfMessage( 'youremail' )->escaped()
- . wfMessage( 'word-separator' )->escaped() .
$emailAddress;
$preferences['echo-emailaddress'] = array(
'type' => 'info',
'raw' => true,
- 'default' => $emailContent,
- 'section' => 'echo/emailfrequency'
+ 'default' => $emailAddress,
+ 'label-message' => 'echo-pref-send-to',
+ 'section' => 'echo/emailsettings'
);
// Sort notification categories by priority
--
To view, visit https://gerrit.wikimedia.org/r/59774
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: If63720afe35f2edfa90b2c74d93fe355abd5da61
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Echo
Gerrit-Branch: master
Gerrit-Owner: Kaldari <[email protected]>
Gerrit-Reviewer: Bsitu <[email protected]>
Gerrit-Reviewer: Lwelling <[email protected]>
Gerrit-Reviewer: Matthias Mullie <[email protected]>
Gerrit-Reviewer: Siebrand <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
