wikimedia/mediawiki-extensions-Echo
1
0
Fork 0
mirror of https://gerrit.wikimedia.org/r/mediawiki/extensions/Echo synced 2024-11-30 18:45:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

New presentation of email notification settings per requirements

Browse source 
We have a new shorter header and add labels for the two options.

Change-Id: If63720afe35f2edfa90b2c74d93fe355abd5da61
This commit is contained in:
kaldari 2013-04-17 17:44:20 -07:00
parent aa315ebd90
commit d4a15e3ee4
2 changed files with 13 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
Echo.i18n.php
View file

@ -13,9 +13,11 @@ $messages['en'] = array(
// Preferences // Preferences
'prefs-echo' => 'Notifications', 'prefs-echo' => 'Notifications',
'prefs-emailsettings' => 'Email settings',
'prefs-displaynotifications' => 'Display options', 'prefs-displaynotifications' => 'Display options',
'prefs-emailfrequency' => 'When would you like to receive email notifications?',
'prefs-echosubscriptions' => 'Notify me about these events', '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-web' => 'Web',
'echo-pref-email' => 'Email', 'echo-pref-email' => 'Email',
'echo-pref-email-frequency-never' => 'Do not send me any email notifications', 'echo-pref-email-frequency-never' => 'Do not send me any email notifications',
@ -196,13 +198,15 @@ $messages['qqq'] = array(
'echo-desc' => '{{desc|name=Echo|url=http://www.mediawiki.org/wiki/Extension:Echo}}', 'echo-desc' => '{{desc|name=Echo|url=http://www.mediawiki.org/wiki/Extension:Echo}}',
'prefs-echo' => 'Name of preferences section for Echo notifications. 'prefs-echo' => 'Name of preferences section for Echo notifications.
{{Identical|Notification}}', {{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-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-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-daily}}
* {{msg-mw|Echo-pref-email-frequency-weekly}}', * {{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-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' => '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 'echo-pref-email-frequency-never' => "Option for users who don't want to receive any email notifications

11
Hooks.php
View file

@ -276,8 +276,8 @@ class EchoHooks {
} }
$preferences['echo-email-frequency'] = array( $preferences['echo-email-frequency'] = array(
'type' => 'select', 'type' => 'select',
//'label-message' => 'echo-pref-email-frequency', 'label-message' => 'echo-pref-send-me',
'section' => 'echo/emailfrequency', 'section' => 'echo/emailsettings',
'options' => $freqOptions 'options' => $freqOptions
); );
@ -298,13 +298,12 @@ class EchoHooks {
. wfMessage( 'parentheses' )->rawParams( $link )->escaped(); . wfMessage( 'parentheses' )->rawParams( $link )->escaped();
} }
} }
$emailContent = wfMessage( 'youremail' )->escaped()
. wfMessage( 'word-separator' )->escaped() . $emailAddress;
$preferences['echo-emailaddress'] = array( $preferences['echo-emailaddress'] = array(
'type' => 'info', 'type' => 'info',
'raw' => true, 'raw' => true,
'default' => $emailContent, 'default' => $emailAddress,
'section' => 'echo/emailfrequency' 'label-message' => 'echo-pref-send-to',
'section' => 'echo/emailsettings'
); );
// Sort notification categories by priority // Sort notification categories by priority