jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/344451 )
Change subject: RCFilters: Make Wikidata filter conflict with non-minor edits
......................................................................
RCFilters: Make Wikidata filter conflict with non-minor edits
Bug: T161665
Change-Id: I5fc9707df56b1faf03f98cf04fdc7d705e10b1da
---
M client/i18n/en.json
M client/i18n/qqq.json
M client/includes/Hooks/ChangesListSpecialPageHookHandlers.php
3 files changed, 15 insertions(+), 1 deletion(-)
Approvals:
jenkins-bot: Verified
Jforrester: Looks good to me, approved
diff --git a/client/i18n/en.json b/client/i18n/en.json
index 565b5ae..d64854c 100644
--- a/client/i18n/en.json
+++ b/client/i18n/en.json
@@ -81,6 +81,9 @@
"wikibase-rcfilters-hide-wikibase-conflicts-ores-global": "The
\"{{WBREPONAME}} edits\" filter is conflicting with one or more Contribution
Quality or User Intent filters. Quality and Intent predictions are not
available for {{WBREPONAME}} edits. The conflicting filters are marked in the
Active Filters area, above.",
"wikibase-rcfilters-damaging-conflicts-hide-wikibase": "Contribution
Quality predictions are not available for certain types of change, so this
filter conflicts with the following Type of Change
{{PLURAL:$2|filter|filters}}: $1",
"wikibase-rcfilters-goodfaith-conflicts-hide-wikibase": "User Intent
predictions are not available for certain types of change, so this filter
conflicts with the following Type of Change {{PLURAL:$2|filter|filters}}: $1",
+ "wikibase-rcfilters-hide-wikibase-conflicts-major-global": "All
{{WBREPONAME}} edits are designated as \"minor\", so the \"{{WBREPONAME}}
edits\" filter conflicts with the \"Non-minor edits\" filter.",
+ "wikibase-rcfilters-major-conflicts-hide-wikibase": "All {{WBREPONAME}}
edits are designated as \"minor\", so the \"{{WBREPONAME}} edits\" filter
conflicts with the \"Non-minor edits\" filter.",
+ "wikibase-rcfilters-hide-wikibase-conflicts-major": "All {{WBREPONAME}}
edits are designated as \"minor\", so the \"{{WBREPONAME}} edits\" filter
conflicts with the \"Non-minor edits\" filter.",
"wikibase-replicationnote": "Please notice that it can take several
minutes until the changes are visible on all wikis.",
"wikibase-watchlist-show-changes-pref": "Show {{WBREPONAME}} edits in
your watchlist",
"wikibase-error-deserialize-error": "Failed to deserialize data.",
diff --git a/client/i18n/qqq.json b/client/i18n/qqq.json
index 91f05e2..6ba3017 100644
--- a/client/i18n/qqq.json
+++ b/client/i18n/qqq.json
@@ -92,6 +92,9 @@
"wikibase-rcfilters-hide-wikibase-conflicts-ores-global": "Message
shown in the result area when both an ORES filter and the 'Wikidata edits'
filter are selected. This indicates that no results will be shown because
propagated Wikidata edits do not have ORES scores available.\n\n* \"Wikidata
edits\" is {{msg-mw|wikibase-rcfilters-hide-wikibase-label}}.\n* \"Contribution
quality\" is based on {{msg-mw|Ores-rcfilters-damaging-title}}.\n* \"User
intent\" is based on {{msg-mw|Ores-rcfilters-goodfaith-title}}.\n* \"Active
Filters\" is based on {{msg-mw|rcfilters-activefilters}}.",
"wikibase-rcfilters-damaging-conflicts-hide-wikibase": "Tooltip shown
when hovering over a 'Contribution quality predictions' filter tag, when the
'Wikidata edits' filter is selected and there is a conflict. Propagated
Wikidata edits do not have ORES scores avaialble. Parameters:\n* $1 -
Comma-separated string of selected Type of Change filters, e.g. \"Wikidata
edits\"\n* $2 - Count of selected Type of Change filters, for PLURAL",
"wikibase-rcfilters-goodfaith-conflicts-hide-wikibase": "Tooltip shown
when hovering over a 'User intent predictions' filter tag, when the 'Wikidata
edits' filter is selected and there is a conflict. 'Wikidata edits' are not
scored by ORES. Parameters:\n* $1 - Comma-separated string of selected Type of
Change filters, e.g. \"Wikidata edits\"\n* $2 - Count of selected Type of
Change filters, for PLURAL",
+ "wikibase-rcfilters-hide-wikibase-conflicts-major-global": "Message
shown in the result area when both the Non-minor filter and 'Wikidata edits'
filter are selected. This indicates that no results will be
shown.\n\n\"Non-minor edits\" is
{{msg-mw|rcfilters-filter-major-label}}.\n\n\"Wikidata edits\" is
{{msg-mw|wikibase-rcfilters-hide-wikibase-label}}.",
+ "wikibase-rcfilters-major-conflicts-hide-wikibase": "Tooltip shown when
hovering over the Non-minor edits tag when 'Wikidata edits' filter is also
selected.\n\n\"Non-minor edits\" is
{{msg-mw|rcfilters-filter-major-label}}.\n\n\"\"Wikidata edits\" is
{{msg-mw|wikibase-rcfilters-hide-wikibase-label}}.\n\nThis indicates that no
results will be shown.",
+ "wikibase-rcfilters-hide-wikibase-conflicts-major": "Tooltip shown when
hovering over a 'Wikidata edits' filter tag when the Non-minor edits filter is
also selected.\n\n\"Non-minor edits\" is
{{msg-mw|rcfilters-filter-major-label}}.\n\n\"Wikidata edits\" is
{{msg-mw|wikibase-rcfilters-hide-wikibase-label}}.\n\nThis indicates that no
results will be shown.",
"wikibase-replicationnote": "Note telling the user that it can take a
few minutes until the made changes are visible on all wikis.\nPreceded by
message {{msg-mw|Wikibase-linkitem-success-link}}",
"wikibase-watchlist-show-changes-pref": "Option in the watchlist
section of preferences to always show wikibase edits by default in the
watchlist. Appears as a checkbox in the same list with options such as:\n*
{{msg-mw|tog-watchdefault}}\n* {{msg-mw|tog-watchmoves}}\nAnd so on.",
"wikibase-error-deserialize-error": "Generic error when invalid
(undeserializable) data has been given.",
diff --git a/client/includes/Hooks/ChangesListSpecialPageHookHandlers.php
b/client/includes/Hooks/ChangesListSpecialPageHookHandlers.php
index b1f525e..ee7aef7 100644
--- a/client/includes/Hooks/ChangesListSpecialPageHookHandlers.php
+++ b/client/includes/Hooks/ChangesListSpecialPageHookHandlers.php
@@ -229,8 +229,16 @@
}
] );
- $extensionRegistry = ExtensionRegistry::getInstance();
+ $significanceGroup = $specialPage->getFilterGroup(
'significance' );
+ $hideMajorFilter = $significanceGroup->getFilter( 'hidemajor' );
+ $hideMajorFilter->conflictsWith(
+ $wikidataFilter,
+
'wikibase-rcfilters-hide-wikibase-conflicts-major-global',
+ 'wikibase-rcfilters-major-conflicts-hide-wikibase',
+ 'wikibase-rcfilters-hide-wikibase-conflicts-major'
+ );
+ $extensionRegistry = ExtensionRegistry::getInstance();
if ( $extensionRegistry->isLoaded( 'ORES' ) ) {
$damagingGroup = $specialPage->getFilterGroup(
'damaging' );
if ( $damagingGroup ) {
--
To view, visit https://gerrit.wikimedia.org/r/344451
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I5fc9707df56b1faf03f98cf04fdc7d705e10b1da
Gerrit-PatchSet: 5
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Catrope <r...@wikimedia.org>
Gerrit-Reviewer: Catrope <r...@wikimedia.org>
Gerrit-Reviewer: Hoo man <h...@online.de>
Gerrit-Reviewer: Jforrester <jforres...@wikimedia.org>
Gerrit-Reviewer: Lydia Pintscher (WMDE) <lydia.pintsc...@wikimedia.de>
Gerrit-Reviewer: Mattflaschen <mflasc...@wikimedia.org>
Gerrit-Reviewer: Sbisson <sbis...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
