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

Merge "Link to the notifications FAQ from Preferences"

Browse source
This commit is contained in:
jenkins-bot 2013-05-02 00:19:45 +00:00 committed by Gerrit Code Review
parent 729cd1d370 113fe8cd84
commit 68248ccd7f
2 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Echo.i18n.php
View file

@ -25,6 +25,7 @@ $messages['en'] = array(
'echo-pref-email-frequency-daily' => 'A daily summary of notifications',
'echo-pref-email-frequency-weekly' => 'A weekly summary of notifications',
'echo-pref-notify-show-link' => 'Show notifications in my toolbar',
'echo-learn-more' => 'Learn more',
// Dismiss interface
'echo-dismiss-button' => 'Dismiss',
@ -221,6 +222,7 @@ See also:
'echo-pref-email-frequency-daily' => 'Option for users who want to receive a daily digest of email notifications',
'echo-pref-email-frequency-weekly' => 'Option for users who want to receive a weekly digest of email notifications',
'echo-pref-notify-show-link' => "Label for a preference which enables the 'Notifications' link in the header and associated fly-out panel",
'echo-learn-more' => 'Text for link to more information about a topic.',
'echo-dismiss-button' => 'Text for the button that dismisses a notification type. Keep this short.
{{Identical|Dismiss}}',
'echo-dismiss-message' => 'Message asking the user if they want to turn off all notifications of a certain type. Parameters:
@ -2099,7 +2101,7 @@ $2
$4',
'notification-edit-talk-page-email-batch-body2' => '$1 {{GENDER:$1|כתב|כתבה}} הדף השיחה שלך',
'notification-page-linked-email-subject' => 'מישהו קישר אל הדף שיצרת באתר {{SITENAME}}',
'notification-page-linked-email-body' => '$1
'notification-page-linked-email-body' => '$1
כל הקישורים אל הדף הזה:

10
Hooks.php
View file

@ -244,7 +244,8 @@ class EchoHooks {
*/
public static function getPreferences( $user, &$preferences ) {
global $wgEchoDefaultNotificationTypes, $wgAuth, $wgEchoEnableEmailBatch,
$wgEchoNotifiers, $wgEchoNotificationCategories, $wgEchoNotifications;
$wgEchoNotifiers, $wgEchoNotificationCategories, $wgEchoNotifications,
$wgEchoHelpPage;
// Show email frequency options
$never = wfMessage( 'echo-pref-email-frequency-never' )->plain();
@ -354,6 +355,11 @@ class EchoHooks {
'rows' => $rows,
'columns' => $columns,
'remove-options' => $removeOptions,
'help' => Html::rawElement(
'a',
array( 'href' => $wgEchoHelpPage ),
wfMessage( 'echo-learn-more' )->escaped()
),
);
// If we're using Echo to handle user talk page post notifications,
@ -501,7 +507,7 @@ class EchoHooks {
}
// Handle only
// 1. inserts to pagelinks table &&
// 1. inserts to pagelinks table &&
// 2. content namespace pages &&
// 3. non-transcluding pages &&
// 4. non-redirect pages