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

Merge "Remove all traces of cross-wiki beta feature"

Browse source
This commit is contained in:
jenkins-bot 2019-04-19 23:25:04 +00:00 committed by Gerrit Code Review
parent 1017054b88 2fb8db3bca
commit 0174b81a3a
6 changed files with 2 additions and 88 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
extension.json
View file

@ -430,7 +430,6 @@
"SendWatchlistEmailNotification": "EchoHooks::onSendWatchlistEmailNotification",
"GetNewMessagesAlert": "EchoHooks::abortNewMessagesAlert",
"LinksUpdateAfterInsert": "EchoHooks::onLinksUpdateAfterInsert",
"GetBetaFeaturePreferences": "EchoHooks::getBetaFeaturePreferences",
"ResourceLoaderGetConfigVars": "EchoHooks::onResourceLoaderGetConfigVars"
},
"config": {
@ -524,9 +523,6 @@
"EchoCrossWikiNotifications": {
"value": false
},
"EchoUseCrossWikiBetaFeature": {
"value": false
},
"EchoNotificationCategories": {
"value": {
"system": {

2
i18n/en.json
View file

@ -54,8 +54,6 @@
"echo-pref-email-format-plain-text": "Plain text",
"echo-pref-cross-wiki-notifications": "Show notifications from other wikis",
"echo-pref-notifications-blacklist": "Do not display notifications from these users. ([[mw:Special:MyLanguage/Help:Notifications#mute|learn more]])",
"echo-pref-beta-feature-cross-wiki-message": "Enhanced notifications",
"echo-pref-beta-feature-cross-wiki-description": "View and organize notifications more easily. Includes cross-wiki notifications, which lets you see messages from other wikis. (To receive cross-wiki notifications on a given wiki, you must activate the beta feature on that wiki.)",
"echo-learn-more": "Learn more",
"echo-log": "Public log",
"echo-new-messages": "You have new messages",

2
i18n/qqq.json
View file

@ -53,8 +53,6 @@
"echo-pref-email-format-plain-text": "Option for users who want to receive plain text email notification.\n\nSee also:\n* {{msg-mw|Echo-pref-email-format}}\n{{Identical|Plain text}}",
"echo-pref-cross-wiki-notifications": "Label for a preference which enables notifications from other wikis. Only used if {{msg-mw|echo-pref-beta-feature-cross-wiki-message}} is not used.",
"echo-pref-notifications-blacklist": "Label for a preference which allows a user to block notifications from certain users.\n\nNote that the translatewiki.net tool may warn, if you alter the link to use an existing translated version linked from the English page at [[mw:Help:Notifications#mute]], such as [[mw:Help:Notifications/fr#mute]] for the French version.",
"echo-pref-beta-feature-cross-wiki-message": "Label for the cross-wiki notifications Beta Feature. Only used if {{msg-mw|echo-pref-cross-wiki-notifications}} is not used.",
"echo-pref-beta-feature-cross-wiki-description": "Description for the cross-wiki notifications Beta Feature, describing the feature that will be enabled. Only used if {{msg-mw|echo-pref-cross-wiki-notifications}} is not used.",
"echo-learn-more": "Text for link to more information about a topic.\n{{Identical|Learn more}}",
"echo-log": "Text for link to go to Special:Log",
"echo-new-messages": "Message to let the user know that they have new talk page messages, displayed in the personal menu (top-right corner on Vector and Monobook).\n\nKeep this message short. It '''should not''' end in a full stop.",

24
images/betafeatures-icon-notifications-ltr.svg
View file

@ -1,24 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<svg xmlns="http://www.w3.org/2000/svg" width="264" height="162" viewBox="0 0 264 162">
<defs>
<clipPath id="jagged-edge">
<path d="M0 0v152l12 10 12-10 12 10 12-10 12 10 12-10 12 10 12-10 12 10 12-10 12 10 12-10 12 10 12-10 12 10 12-10 12 10 12-10 12 10 12-10 12 10 12-10V0z"/>
</clipPath>
</defs>
<g fill="#eaecf0" clip-path="url(#jagged-edge)">
<path id="background" fill="#fff" d="M0 0h264v162H0"/>
<path id="logo" d="M11 22c0-8 6-14 14-14s14 6 14 14-6 14-14 14-14-6-14-14m27 23v-5H13v5h25"/>
<path id="sidebar" d="M38 163V58H13v106h25"/>
<path id="personal-tools" d="M233 5h26v6h-26V5zm-24 0h22v6h-22zm-24 0h22v6h-22zm-23 0h13v6h-13zm15 0h6v6h-6zm-23 0h6v6h-6z"/>
<g id="search">
<path id="input" d="M258 16v4h-92v-4h92m1-1h-94v6h94v-6z"/>
<path id="icon" d="M168 17h2v2h-2z"/>
</g>
<path id="article" d="M252 162V29H48v133z"/>
<path id="border" d="M0 0v162h264V0zm1 1h262v150.533l-11 9.166-12-10-12 10-12-10-12 10-12-10-12 10-12-10-12 10-12-10-12 10-12-10-12 10-12-10-12 10-12-10-12 10-12-10-12 10-12-10-12 10-11-9z"/>
<path fill="#36c" d="M177.02 5h6v6h-6z"/>
<rect fill="#36c" y="18.566" x="140.812" ry=".099" rx=".106" height="93.208" width="78.835"/>
<path fill="#36c" d="M175.692 19l4.537-6 4.536 6"/>
<path fill="#fff" d="M180.23 44.254c-7.437 0-12.783 4.648-12.783 11.62v11.62c0 4.648 0 6.972-4.648 6.972v2.324h34.86v-2.324c-4.65 0-4.65-2.324-4.65-6.972v-11.62c0-6.972-5.344-11.62-12.78-11.62zm-6.973 37.184c0 2.324 3.72 4.648 6.972 4.648 3.253 0 6.97-2.324 6.97-4.648h-13.943z"/>
</g>
</svg>
Side by side

Before

Width:  |  Height:  |  Size: 1.5 KiB

24
images/betafeatures-icon-notifications-rtl.svg
View file

@ -1,24 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<svg xmlns="http://www.w3.org/2000/svg" width="264" height="162" viewBox="0 0 264 162">
<defs>
<clipPath id="jagged-edge">
<path d="M0 0v152l12 10 12-10 12 10 12-10 12 10 12-10 12 10 12-10 12 10 12-10 12 10 12-10 12 10 12-10 12 10 12-10 12 10 12-10 12 10 12-10 12 10 12-10V0z"/>
</clipPath>
</defs>
<g fill="#eaecf0" transform="matrix(-1 0 0 1 264 0)" clip-path="url(#jagged-edge)">
<path id="background" fill="#fff" d="M0 0h264v162H0"/>
<path id="logo" d="M11 22c0-8 6-14 14-14s14 6 14 14-6 14-14 14-14-6-14-14m27 23v-5H13v5h25"/>
<path id="sidebar" d="M38 163V58H13v106h25"/>
<path id="personal-tools" d="M233 5h26v6h-26V5zm-24 0h22v6h-22zm-24 0h22v6h-22zm-23 0h13v6h-13zm15 0h6v6h-6zm-23 0h6v6h-6z"/>
<g id="search">
<path id="input" d="M258 16v4h-92v-4h92m1-1h-94v6h94v-6z"/>
<path id="icon" d="M168 17h2v2h-2z"/>
</g>
<path id="article" d="M252 162V29H48v133z"/>
<path id="border" d="M0 0v162h264V0zm1 1h262v150.533l-11 9.166-12-10-12 10-12-10-12 10-12-10-12 10-12-10-12 10-12-10-12 10-12-10-12 10-12-10-12 10-12-10-12 10-12-10-12 10-12-10-12 10-11-9z"/>
<path fill="#36c" d="M177.02 5h6v6h-6z"/>
<rect fill="#36c" y="18.566" x="140.812" ry=".099" rx=".106" height="93.208" width="78.835"/>
<path fill="#36c" d="M175.692 19l4.537-6 4.536 6"/>
<path fill="#fff" d="M180.23 44.254c-7.437 0-12.783 4.648-12.783 11.62v11.62c0 4.648 0 6.972-4.648 6.972v2.324h34.86v-2.324c-4.65 0-4.65-2.324-4.65-6.972v-11.62c0-6.972-5.344-11.62-12.78-11.62zm-6.973 37.184c0 2.324 3.72 4.648 6.972 4.648 3.253 0 6.97-2.324 6.97-4.648h-13.943z"/>
</g>
</svg>
Side by side

Before

Width:  |  Height:  |  Size: 1.6 KiB

34
includes/EchoHooks.php
View file

@ -282,36 +282,6 @@ class EchoHooks {
return true;
}
/**
* Handler for the GetBetaFeaturePreferences hook.
* @see https://www.mediawiki.org/wiki/Manual:Hooks/GetBetaFeaturePreferences
*
* @param User $user User to get preferences for
* @param array &$preferences Preferences array
*
* @return bool true in all cases
*/
public static function getBetaFeaturePreferences( User $user, array &$preferences ) {
global $wgExtensionAssetsPath, $wgEchoUseCrossWikiBetaFeature, $wgEchoCrossWikiNotifications;
if ( $wgEchoUseCrossWikiBetaFeature && $wgEchoCrossWikiNotifications ) {
$preferences['echo-cross-wiki-notifications'] = [
'label-message' => 'echo-pref-beta-feature-cross-wiki-message',
'desc-message' => 'echo-pref-beta-feature-cross-wiki-description',
// Paths to images that represents the feature.
'screenshot' => [
'rtl' => "$wgExtensionAssetsPath/Echo/images/betafeatures-icon-notifications-rtl.svg",
'ltr' => "$wgExtensionAssetsPath/Echo/images/betafeatures-icon-notifications-ltr.svg",
],
'info-link' => 'https://www.mediawiki.org/wiki/Special:Mylanguage/Help:Notifications/Cross-wiki',
// Link to discussion about the feature - talk pages might work
'discussion-link' => 'https://www.mediawiki.org/wiki/Help_talk:Notifications',
];
}
return true;
}
/**
* Handler for GetPreferences hook.
* @see https://www.mediawiki.org/wiki/Manual:Hooks/GetPreferences
@ -325,7 +295,7 @@ class EchoHooks {
public static function getPreferences( $user, &$preferences ) {
global $wgEchoEnableEmailBatch,
$wgEchoNotifiers, $wgEchoNotificationCategories, $wgEchoNotifications,
$wgAllowHTMLEmail, $wgEchoUseCrossWikiBetaFeature,
$wgAllowHTMLEmail,
$wgEchoCrossWikiNotifications, $wgEchoPerUserBlacklist;
$attributeManager = EchoAttributeManager::newFromGlobalVars();
@ -464,7 +434,7 @@ class EchoHooks {
'tooltips' => $tooltips,
];
if ( !$wgEchoUseCrossWikiBetaFeature && $wgEchoCrossWikiNotifications ) {
if ( $wgEchoCrossWikiNotifications ) {
$preferences['echo-cross-wiki-notifications'] = [
'type' => 'toggle',
'label-message' => 'echo-pref-cross-wiki-notifications',