EBernhardson (WMF) has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/61888


Change subject: Link to the notifications FAQ from Preferences
......................................................................

Link to the notifications FAQ from Preferences

Bug: 47094
Change-Id: I22c420ff31e8b54ea306effedac42e029d29250e
---
M Echo.i18n.php
M Hooks.php
2 files changed, 10 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Echo 
refs/changes/88/61888/1

diff --git a/Echo.i18n.php b/Echo.i18n.php
index e077a5b..4dcf2ee 100644
--- a/Echo.i18n.php
+++ b/Echo.i18n.php
@@ -25,6 +25,7 @@
        '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-pref-learn-more' => 'Learn more',
 
        // Dismiss interface
        'echo-dismiss-button' => 'Dismiss',
@@ -221,6 +222,7 @@
        '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-pref-learn-more' => 'Text for the link to Notifications FAQ from 
Preferences',
        '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 @@
 $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 5646e75..8f4e38a 100644
--- a/Hooks.php
+++ b/Hooks.php
@@ -348,12 +348,18 @@
                        }
                }
 
+               global $wgEchoHelpPage;
                $preferences['echo-subscriptions'] = array(
                        'class' => 'HTMLCheckMatrix',
                        'section' => 'echo/echosubscriptions',
                        'rows' => $rows,
                        'columns' => $columns,
                        'remove-options' => $removeOptions,
+                       'help' => Html::element(
+                               'a',
+                               array( 'href' => $wgEchoHelpPage ),
+                               wfMessage( 'echo-pref-learn-more' )->escaped()
+                       ),
                );
 
                // If we're using Echo to handle user talk page post 
notifications,
@@ -501,7 +507,7 @@
                }
 
                // Handle only
-               // 1. inserts to pagelinks table && 
+               // 1. inserts to pagelinks table &&
                // 2. content namespace pages &&
                // 3. non-transcluding pages &&
                // 4. non-redirect pages

-- 
To view, visit https://gerrit.wikimedia.org/r/61888
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I22c420ff31e8b54ea306effedac42e029d29250e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Echo
Gerrit-Branch: master
Gerrit-Owner: EBernhardson (WMF) <[email protected]>

_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to