From 113fe8cd84e29885cae04f6fe2a8207662669df7 Mon Sep 17 00:00:00 2001 From: Erik Bernhardson Date: Wed, 1 May 2013 13:48:12 -0700 Subject: [PATCH] Link to the notifications FAQ from Preferences Bug: 47094 Change-Id: I22c420ff31e8b54ea306effedac42e029d29250e --- Echo.i18n.php | 4 +++- Hooks.php | 10 ++++++++-- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/Echo.i18n.php b/Echo.i18n.php index e077a5b4b..ef29b04d4 100644 --- a/Echo.i18n.php +++ b/Echo.i18n.php @@ -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: @@ -2104,7 +2106,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 כל הקישורים אל הדף הזה: diff --git a/Hooks.php b/Hooks.php index 5646e7553..2f6ef4e76 100644 --- a/Hooks.php +++ b/Hooks.php @@ -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