diff --git a/extension.json b/extension.json index 2065877a7..31fc57cd8 100644 --- a/extension.json +++ b/extension.json @@ -163,8 +163,6 @@ "echo-overlay-link", "echo-mark-all-as-read", "echo-mark-wiki-as-read", - "echo-more-info", - "echo-feedback", "echo-notification-alert", "echo-notification-notice", "echo-notification-loginrequired", @@ -362,7 +360,6 @@ "ext.echo.styles.special" ], "messages": [ - "echo-load-more-error", "notification-inbox-filter-read", "notification-inbox-filter-unread", "notification-inbox-filter-all", @@ -372,10 +369,8 @@ "echo-specialpage-pagefilters-title", "echo-specialpage-pagefilters-subtitle", "echo-mark-all-as-read", - "echo-more-info", "echo-learn-more", "mypreferences", - "echo-feedback", "echo-specialpage-section-markread" ], "targets": [ diff --git a/i18n/en.json b/i18n/en.json index 00be25c21..d409250b8 100644 --- a/i18n/en.json +++ b/i18n/en.json @@ -38,7 +38,6 @@ "echo-desc": "System for notifying users about events and messages", "prefs-echo": "Notifications", "prefs-emailsettings": "Email options", - "prefs-displaynotifications": "Display options", "prefs-echosubscriptions": "Notify me about these events", "prefs-echocrosswiki": "Cross-wiki notifications", "prefs-blocknotificationslist": "Muted users", @@ -80,7 +79,6 @@ "echo-pref-tooltip-user-rights": "Notify me when someone changes my user rights.", "echo-pref-tooltip-emailuser": "Notify me when someone sends me an email.", "echo-pref-tooltip-article-reminder": "Notify me about this page when I ask.", - "echo-error-no-formatter": "No formatting defined for notification.", "notifications": "Notifications", "tooltip-pt-notifications-alert": "{{GENDER:|Your}} alerts", "tooltip-pt-notifications-notice": "{{GENDER:|Your}} notices", @@ -106,11 +104,7 @@ "echo-specialpage-pagefilters-title": "Recent activity", "echo-specialpage-pagefilters-subtitle": "Pages with unread notifications", "notificationsmarkread-legend": "Mark notification as read", - "echo-anon": "To receive notifications, [$1 create an account] or [$2 log in].", "echo-none": "You have no notifications.", - "echo-more-info": "More info", - "echo-feedback": "Feedback", - "echo-quotation-marks": "\"$1\"", "echo-api-failure": "Failed to fetch notifications.", "echo-api-failure-cross-wiki": "Access to the remote domain was denied.", "echo-notification-placeholder": "There are no notifications.", @@ -189,7 +183,6 @@ "notification-header-emailuser": "$1 {{GENDER:$2|sent}} you an email.", "notification-body-emailuser": "$1", "notification-edit-talk-page-email-subject2": "$1 {{GENDER:$2|left}} {{GENDER:$3|you}} a message on {{SITENAME}}", - "notification-edit-talk-page-email-batch-body-with-section": "$1 {{GENDER:$1|left}} a message on your talk page in \"$2\".", "notification-page-linked-email-subject": "A page {{GENDER:$3|you}} created was linked on {{SITENAME}}", "notification-reverted-email-subject2": "{{GENDER:$3|Your}} {{PLURAL:$4|edit was|edits were}} {{GENDER:$2|reverted}} on {{SITENAME}}", "notification-mention-email-subject": "$1 {{GENDER:$2|mentioned}} {{GENDER:$3|you}} on {{SITENAME}}", @@ -205,9 +198,6 @@ "notification-inbox-filter-read": "Read", "notification-inbox-filter-unread": "Unread", "notification-inbox-filter-all": "All", - "echo-email-body-default": "You have a new notification at {{SITENAME}}:\n\n$1", - "echo-email-footer-default-html": "To control which emails we send you, check your preferences.
\n$1", - "echo-email-footer-default": "$2\n\nTo control which emails we send you, check your preferences:\n{{canonicalurl:{{#special:Preferences}}#mw-prefsection-echo}}\n\n$1", "echo-email-plain-footer": "To control which emails we send {{GENDER:$1|you}}, check {{GENDER:$1|your}} preferences:", "echo-email-html-footer-preference-link-text": "check {{GENDER:$1|your}} preferences", "echo-email-html-footer-with-link": "To control which emails we send {{GENDER:$2|you}}, $1.", @@ -217,15 +207,12 @@ "echo-notification-notice-text-only": "Notices", "echo-overlay-link": "All notifications", "echo-overlay-title": "Notifications", - "echo-overlay-title-overflow": "{{PLURAL:$1|Notification|Notifications}} (showing $1 of $2 unread)", "echo-mark-all-as-read": "Mark all as read", "echo-mark-all-as-read-confirmation": "$1 {{PLURAL:$1|notification|notifications}} marked as read", "echo-mark-wiki-as-read": "Mark all as read in selected wiki: $1", "echo-date-today": "Today", "echo-date-yesterday": "Yesterday", - "echo-load-more-error": "An error occurred while fetching more results.", "notification-bundle-header-edit-user-talk-v2": "{{PLURAL:$1|One new message|$1 new messages|100=99+ new messages}} on {{GENDER:$3|your}} talk page.", - "echo-email-batch-separator": "--", "echo-email-batch-bullet": "•", "echo-email-batch-subject-daily": "You have {{PLURAL:$2|a new notification|new notifications}} at {{SITENAME}}", "echo-email-batch-subject-weekly": "You have {{PLURAL:$2|a new notification|new notifications}} at {{SITENAME}} this week", diff --git a/i18n/qqq.json b/i18n/qqq.json index df9ec9a8c..86144e002 100644 --- a/i18n/qqq.json +++ b/i18n/qqq.json @@ -37,7 +37,6 @@ "echo-desc": "{{desc|name=Echo|url=https://www.mediawiki.org/wiki/Extension:Echo}} The [https://www.mediawiki.org/wiki/Help:Notifications Mediawiki help] page gives notes on the terminology in this extension.", "prefs-echo": "Name of preferences section for Echo notifications.\n{{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.\n{{Identical|E-mail option}}", - "prefs-displaynotifications": "Header for the section of preferences that deals with how notifications are displayed", "prefs-echosubscriptions": "Header for the section of preferences that deals with which notifications the user receives", "prefs-echocrosswiki": "Header for the section of preferences that deals with notifications from other wikis", "prefs-blocknotificationslist": "Header for the section of preferences that deals with blocking notifications from certain users", @@ -79,7 +78,6 @@ "echo-pref-tooltip-user-rights": "{{doc-echo-pref-tooltip|title=Echo-category-title-user-rights}}", "echo-pref-tooltip-emailuser": "{{doc-echo-pref-tooltip|title=Echo-category-title-emailuser}}", "echo-pref-tooltip-article-reminder": "{{doc-echo-pref-tooltip|title=Echo-category-title-article-reminder}}", - "echo-error-no-formatter": "Error message displayed when no formatting has been defined for a notification. In other words, the extension doesn't know how to properly display the notification.", "notifications": "{{doc-special|Notifications}}\n{{Identical|Notification}}", "tooltip-pt-notifications-alert": "This is used for the title (mouseover text) of the alert notifications user tool.", "tooltip-pt-notifications-notice": "This is used for the title (mouseover text) of the notice notifications user tool.", @@ -104,12 +102,8 @@ "echo-specialpage-pagination-range": "Label noting the range of the notifications displayed in the page. This only appears if there are multiple pages of results available.\n\nParameters:\n* $1 - Number of the first item.\n* $2 - Number of the last item.", "echo-specialpage-pagefilters-title": "Title of the page filter box in Special:Notifications page.", "echo-specialpage-pagefilters-subtitle": "Subtitle of the page filter box in Special:Notifications page.", - "notificationsmarkread-legend": "Title for the form that marks a notification as read in [[Special:NotificationsMarkAsRead]]", - "echo-anon": "Error message shown to users who try to visit [[Special:Notifications]] as an anon.\n\nParameters:\n* $1 - URL of signup page, with returnto pointing to Special:Notifications\n* $2 - URL of login page, with returnto pointing to Special:Notifications", + "notificationsmarkread-legend": "Title for the form that marks a notification as read in [[Special:NotificationsMarkRead]]", "echo-none": "Message shown to users who have no notifications. Also shown in the overlay.", - "echo-more-info": "This is used for the title (mouseover text) of an icon that links to a page with more information about the Echo extension.\n{{Identical|More information}}", - "echo-feedback": "Text for a link that goes to a feedback survey shown at [[Special:Notifications]].\n{{Identical|Feedback}}", - "echo-quotation-marks": "Unused at this time.\n\n{{optional}}\nPuts the edit summary in quotation marks. Only translate if different than English.\n\nParameters:\n* $1 - ...", "echo-api-failure": "Label for the text that notes an error in retrieving notifications for the Echo popup.", "echo-api-failure-cross-wiki": "Label for the api failure text for a failure to fetch cross-wiki notifications, but the remote server is not granted access.", "echo-notification-placeholder": "Label for the text that appears if there are no notifications in the Echo popup.", @@ -188,8 +182,7 @@ "notification-header-emailuser": "Flyout-specific format for displaying notifications of user has sent an email to another user.\n\nParameters:\n* $1 - the formatted username of the person who sent the email.\n* $2 - the username for GENDER.", "notification-body-emailuser": "{{notranslate}}", "notification-edit-talk-page-email-subject2": "Email subject. Parameters:\n* $1 - the formatted username of the person who edited (not suitable for GENDER).\n* $2 - the username for GENDER.\n* $3 - username of the current user, can be used for GENDER.", - "notification-edit-talk-page-email-batch-body-with-section": "Email notification for talk page edit with new section or new comment. Parameters:\n* $1 - a username\n* $2 - the raw section title text", - "notification-page-linked-email-subject": "E-mail subject Parameters:\n * $1 - the formatted username of the person who edited (not suitable for GENDER).\n* $2 - the username for GENDER.\n* $3 - username of the current user, can be used for GENDER.\nSee also:\n* {{msg-mw|Notification-page-linked-flyout}}", + "notification-page-linked-email-subject": "E-mail subject Parameters:\n * $1 - the formatted username of the person who edited (not suitable for GENDER).\n* $2 - the username for GENDER.\n* $3 - username of the current user, can be used for GENDER.", "notification-reverted-email-subject2": "Email subject. Parameters:\n* $1 - the formatted username of the person who reverted the edit (not suitable for GENDER).\n* $2 - the username for GENDER.\n* $3 - username of the current user, can be used for GENDER.\n* $4 - the number of reverts\n{{Related|Notification-reverted}}", "notification-mention-email-subject": "Email subject. Parameters:\n* $1 - the formatted username of the person who edited (not suitable for GENDER).\n* $2 - the username for GENDER.\n* $3 - username of the current user, can be used for GENDER.", "notification-user-rights-email-subject": "E-mail subject for user rights notification. Parameters:\n* $1 - the formatted username of the person who made the user rights change (not suitable for GENDER).\n* $2 - the username for GENDER.\n* $3 - username of the current user, can be used for GENDER.", @@ -204,10 +197,7 @@ "notification-inbox-filter-read": "Label for the button that shows only read notification.\n{{Identical|Read}}", "notification-inbox-filter-unread": "Label for the button that shows only unread notification.\n{{Identical|Unread}}", "notification-inbox-filter-all": "Label for the button that shows all notification.\n{{Identical|All}}", - "echo-email-body-default": "Default message content for Echo email notifications. Parameters:\n* $1 - a plain text description of the notification", - "echo-email-footer-default-html": "Default footer content for Echo html e-mail notifications. Parameters:\n* $1 - the address of the organization that sent the email\n* $2 - the URL to the notification preference page\nFor plain-text version, see {{msg-mw|Echo-email-footer-default}}.", - "echo-email-footer-default": "Default footer content for Echo text e-mail notifications. Parameters:\n* $1 - the address of the organization that sent the email\n* $2 - \"-------...\" ({{msg-mw|echo-email-batch-separator}})\n\nFor HTML version, see {{msg-mw|echo-email-footer-default-html}}.", - "echo-email-plain-footer": "Footer content for Echo text e-mail notifications. Parameters:\n* $1 - the name of the user being addressed, used for GENDER\n\nFor HTML version, see {{msg-mw|echo-email-html-footer}}.", + "echo-email-plain-footer": "Footer content for Echo text e-mail notifications. Parameters:\n* $1 - the name of the user being addressed, used for GENDER\n\nFor HTML version, see {{msg-mw|echo-email-html-footer-with-link}}.", "echo-email-html-footer-preference-link-text": "Text of link to the preference page in the footer of HTML emails. Parameters:\n* $1 - the name of the user being addressed, used for GENDER", "echo-email-html-footer-with-link": "Footer content of the HTML email. Parameters:\n* $1 - complete HTML link to the preference page. $2 - the name of the user being addressed, used for GENDER\n\nSee {{msg-mw|echo-email-html-footer-preference-link-text}} for the text of the link.", "echo-notification-alert": "Label for alert notifications (= non discussion notifications) tab in Echo overlay. Parameters:\n* $1 - the number of unread alerts. The number cannot be higher than 100.\nSee also:\n* {{msg-mw|Echo-notification-notice}}\n{{Identical|Alert}}", @@ -216,15 +206,12 @@ "echo-notification-notice-text-only": "Label for notice notifications tab in Echo overlay without notice notification count next to it. That label groups all notifications less important than the ones displayed in \"alerts\".\n{{Identical|Notice}}", "echo-overlay-link": "Link to \"all notifications\" at the bottom of the overlay.\n{{Identical|All notifications}}", "echo-overlay-title": "Title at the top of the notifications overlay. Should include bold tags.\n{{Identical|Notification}}", - "echo-overlay-title-overflow": "Title at the top of the notifications overlay when there are additional unread notifications that are not being shown.\n\nParameters:\n* $1 - the number of unread notifications being shown\n* $2 - the total number of unread notifications that exist", "echo-mark-all-as-read": "Text for button that marks all unread notifications as read. Keep this as short as possible.\n{{Identical|Mark all as read}}", - "echo-mark-all-as-read-confirmation": "Text for the confirmation message that appers after the user marks all unread notifications as read. Keep this as short as possible\n\nParameters:\n* $1 - The number of notifications that were marked as read", + "echo-mark-all-as-read-confirmation": "Text for the confirmation message that appers after the user marks all unread notifications as read, as used on mobile. Keep this as short as possible\n\nParameters:\n* $1 - The number of notifications that were marked as read", "echo-mark-wiki-as-read": "Text for button that marks all unread notifications as read in a specific wiki. Keep this as short as possible.\n\nParameters:\n* $1 - The human readable name of the selected wiki", "echo-date-today": "The header text for today's notification section.\n{{Identical|Today}}", "echo-date-yesterday": "The header text for yesterday's notification section.\n{{Identical|Yesterday}}", - "echo-load-more-error": "Error message for errors in loading more notifications", "notification-bundle-header-edit-user-talk-v2": "Bundled header message for edit-user-talk notification. Parameters:\n* $1 - the number of new messages, except that if the count is greater than 99, this value will be 100; uses standard number formatting and used for PLURAL\n* $2 - Unused\n* $3 - the name of the user being addressed, can be used for GENDER\n{{Related|Notification-bundle}}", - "echo-email-batch-separator": "{{optional}}\nEmail batch content separator", "echo-email-batch-bullet": "{{optional}}", "echo-email-batch-subject-daily": "Daily email batch subject.\n* $1 - (Unused, Compatibility) Same as $2. \n* $2 - a numeric count, this is used for plural support\nSee also:\n* {{msg-mw|Echo-email-batch-subject-weekly}}", "echo-email-batch-subject-weekly": "Weekly email batch subject. Parameters:\n* $1 - (Unused, Compatibility) Same as $2\n* $2 - a numeric count, this is used for plural support\nSee also:\n* {{msg-mw|Echo-email-batch-subject-daily}}", diff --git a/includes/formatters/EchoForeignPresentationModel.php b/includes/formatters/EchoForeignPresentationModel.php index dc9f80875..42e56f81c 100644 --- a/includes/formatters/EchoForeignPresentationModel.php +++ b/includes/formatters/EchoForeignPresentationModel.php @@ -15,6 +15,7 @@ class EchoForeignPresentationModel extends EchoEventPresentationModel { // notification-header-foreign-alert // notification-header-foreign-notice + // notification-header-foreign-all return "notification-header-foreign-{$section}"; }