jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/344667 )
Change subject: Revert "Add conflicts for category changes"
......................................................................
Revert "Add conflicts for category changes"
This reverts commit 95e01ae8bcd76a9a81e7cf402d977497b88f3090.
Bug: T161325
Bug: T160803
Change-Id: Ief5bc777f029194998f7362c9dd92f9bbc5febbb
---
M i18n/en.json
M i18n/qqq.json
M includes/Hooks.php
3 files changed, 8 insertions(+), 25 deletions(-)
Approvals:
jenkins-bot: Verified
Mooeypoo: Looks good to me, approved
diff --git a/i18n/en.json b/i18n/en.json
index 60a8b41..058bd2a 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -16,14 +16,12 @@
"ores-hide-nondamaging-filter": "Hide probably good edits",
"ores-pref-damaging": "ORES sensitivity",
"ores-rcfilters-whats-this-link-text": "Learn more",
- "ores-rcfilters-logactions-conflicts-ores": "This filter conflicts with
one or more Contribution Quality or User Intent filters. Quality and Intent
predictions are not available for logged actions.",
"ores-rcfilters-ores-conflicts-logactions-global": "The \"Logged
actions\" filter conflicts with one or more Contribution Quality or User Intent
filters. Quality and Intent predictions are not available for logged actions.
The conflicting filters are marked in the Active Filters area, above.",
- "ores-rcfilters-ores-conflicts-hidecategorization-global": "The
\"Category changes\" filter conflicts with one or more Contribution Quality or
User Intent filters. Quality and Intent predictions are not available for
category changes. The conflicting filters are marked in the Active Filters
area, above.",
- "ores-rcfilters-hidecategorization-conflicts-ores": "This filter
conflicts with one or more Contribution Quality or User Intent filters. Quality
and Intent predictions are not available for category changes.",
+ "ores-rcfilters-logactions-conflicts-ores": "This filter conflicts with
one or more Contribution Quality or User Intent filters. Quality and Intent
predictions are not available for logged actions.",
"ores-rcfilters-damaging-title": "Contribution quality predictions",
"ores-rcfilters-damaging-whats-this-header": "About contribution
quality predictions",
"ores-rcfilters-damaging-whats-this-body": "These predictions are made
by a machine-learning service trained on a large set of edits scored by human
editors. Stricter, more accurate filters find fewer false positives but miss
more of their target. Less accurate filters find more of their target, but they
also find more false positives.",
- "ores-rcfilters-damaging-conflicts-typeofchange": "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",
+ "ores-rcfilters-damaging-conflicts-logactions": "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",
"ores-rcfilters-damaging-likelygood-label": "Very likely good",
"ores-rcfilters-damaging-likelygood-desc": "Highly accurate at finding
almost all problem-free edits.",
"ores-rcfilters-damaging-maybebad-label": "May have problems",
@@ -35,7 +33,7 @@
"ores-rcfilters-goodfaith-title": "User intent predictions",
"ores-rcfilters-goodfaith-whats-this-header": "About user intent
predictions",
"ores-rcfilters-goodfaith-whats-this-body": "These predictions about
users' good faith are made by a machine-learning service trained on a large set
of edits scored by human editors. Stricter, more accurate filters find fewer
false positives but miss more of their target. Less accurate filters find more
of their target, but they also find more false positives.",
- "ores-rcfilters-goodfaith-conflicts-typeofchange": "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",
+ "ores-rcfilters-goodfaith-conflicts-logactions": "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",
"ores-rcfilters-goodfaith-good-label": "Very likely good faith",
"ores-rcfilters-goodfaith-good-desc": "Highly accurate at finding
almost all good-faith edits.",
"ores-rcfilters-goodfaith-maybebad-label": "May be bad faith",
diff --git a/i18n/qqq.json b/i18n/qqq.json
index 4a23fa3..6f4920f 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -22,14 +22,12 @@
"ores-hide-nondamaging-filter": "Label for Contributions filter, 'only
show'",
"ores-pref-damaging": "Part asking for damaging threshold",
"ores-rcfilters-whats-this-link-text": "Text of a link to more
information about either Contribution Quality Predictions or User Intent
Predictions\n{{Identical|Learn more}}",
- "ores-rcfilters-logactions-conflicts-ores": "Tooltip shown when
hovering over a Logged actions filter tag, when an ORES filter is also
selected.\n\n* \"Logged actions\" is
{{msg-mw|rcfilters-filter-logactions-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}}.",
+ "ores-rcfilters-logactions-conflicts-ores": "Tooltip shown when
hovering over a Logged actions filter tag, when a ORES filter is also
selected.\n\n* \"Logged actions\" is
{{msg-mw|rcfilters-filter-logactions-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}}.",
"ores-rcfilters-ores-conflicts-logactions-global": "Message shown in
the result area when both an ORES filter and the 'Logged actions' filter are
selected. This indicates that no results will be shown because log actions are
never scored by ORES.\n\n* \"Logged actions\" is
{{msg-mw|rcfilters-filter-logactions-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}}.",
- "ores-rcfilters-ores-conflicts-hidecategorization-global": "Message
shown in the result area when both an ORES filter and the 'Category changes'
filter are selected. This indicates that no results will be shown because
categories are never scored by ORES.\n\n* \"Category changes\" is
{{msg-mw|rcfilters-filter-categorization-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}}.",
- "ores-rcfilters-hidecategorization-conflicts-ores": "Tooltip shown when
hovering over a Category changes filter tag, when an ORES filter is also
selected.\n\n* \"Category changes\" is
{{msg-mw|rcfilters-filter-categorization-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}}.",
"ores-rcfilters-damaging-title": "Title for the filter group for ORES
damaging score.",
"ores-rcfilters-damaging-whats-this-header": "Header of \"What's This\"
popup for Contribution Quality group",
"ores-rcfilters-damaging-whats-this-body": "Body of \"What's This\"
popup for Contribution Quality group",
- "ores-rcfilters-damaging-conflicts-typeofchange": "Tooltip shown when
hovering over a 'Contribution quality predictions' filter tag, when a filter
from the 'Type of change' group is selected and there is a conflict. 'Type of
change' results are not scored by ORES. Parameters:\n* $1 - Comma-separated
string of selected Type of Change filters, e.g. \"Logged actions\"\n* $2 -
Count of selected Type of Change filters, for PLURAL",
+ "ores-rcfilters-damaging-conflicts-logactions": "Tooltip shown when
hovering over a 'Contribution quality predictions' filter tag, when the 'Logged
actions' filter is selected and there is a conflict. 'Logged actions' are not
scored by ORES. Parameters:\n* $1 - Comma-separated string of selected Type of
Change filters, e.g. \"Logged actions\"\n* $2 - Count of selected Type of
Change filters, for PLURAL",
"ores-rcfilters-damaging-likelygood-label": "Label for the filter for
showing edits that are very likely to be non-damaging.",
"ores-rcfilters-damaging-likelygood-desc": "Description for the filter
for showing edits that are very likely to be non-damaging.",
"ores-rcfilters-damaging-maybebad-label": "Label for the filter for
showing edits that are somewhat likely to be damaging.",
@@ -41,7 +39,7 @@
"ores-rcfilters-goodfaith-title": "Title for the filter group for ORES
good faith score.",
"ores-rcfilters-goodfaith-whats-this-header": "Header of \"What's
This\" popup for User Intent group",
"ores-rcfilters-goodfaith-whats-this-body": "Body of \"What's This\"
popup for User Intent group",
- "ores-rcfilters-goodfaith-conflicts-typeofchange": "Tooltip shown when
hovering over a 'User intent predictions' filter tag, when when a filter from
the 'Type of change' group is selected and there is a conflict. 'Type of
change' results are not scored by ORES. Parameters:\n* $1 - Comma-separated
string of selected Type of Change filters, e.g. \"Logged actions\"\n* $2 -
Count of selected Type of Change filters, for PLURAL",
+ "ores-rcfilters-goodfaith-conflicts-logactions": "Tooltip shown when
hovering over a 'User intent predictions' filter tag, when the 'Logged actions'
filter is selected and there is a conflict. 'Logged actions' are not scored by
ORES. Parameters:\n* $1 - Comma-separated string of selected Type of Change
filters, e.g. \"Logged actions\"\n* $2 - Count of selected Type of Change
filters, for PLURAL",
"ores-rcfilters-goodfaith-good-label": "Label for the filter for
showing edits that are very likely to be good faith.",
"ores-rcfilters-goodfaith-good-desc": "Description for the filter for
showing edits that are very likely to be good faith.",
"ores-rcfilters-goodfaith-maybebad-label": "Label for the filter for
showing edits that are somewhat likely to be bad faith.",
diff --git a/includes/Hooks.php b/includes/Hooks.php
index e85f9f6..ec8d064 100644
--- a/includes/Hooks.php
+++ b/includes/Hooks.php
@@ -94,7 +94,6 @@
$changeTypeGroup = $clsp->getFilterGroup( 'changeType' );
$logFilter = $changeTypeGroup->getFilter( 'hidelog' );
- $categoryFilter = $changeTypeGroup->getFilter(
'hidecategorization' );
if ( self::isModelEnabled( 'damaging' ) ) {
$damagingLevels = $stats->getThresholds( 'damaging' );
@@ -167,14 +166,8 @@
$newDamagingGroup->conflictsWith(
$logFilter,
'ores-rcfilters-ores-conflicts-logactions-global',
-
'ores-rcfilters-damaging-conflicts-typeofchange',
+ 'ores-rcfilters-damaging-conflicts-logactions',
'ores-rcfilters-logactions-conflicts-ores'
- );
- $newDamagingGroup->conflictsWith(
- $categoryFilter,
-
'ores-rcfilters-ores-conflicts-hidecategorization-global',
-
'ores-rcfilters-damaging-conflicts-typeofchange',
-
'ores-rcfilters-hidecategorization-conflicts-ores'
);
$newDamagingGroup->getFilter( 'maybebad'
)->setAsSupersetOf(
@@ -288,14 +281,8 @@
$goodfaithGroup->conflictsWith(
$logFilter,
'ores-rcfilters-ores-conflicts-logactions-global',
-
'ores-rcfilters-goodfaith-conflicts-typeofchange',
+ 'ores-rcfilters-goodfaith-conflicts-logactions',
'ores-rcfilters-logactions-conflicts-ores'
- );
- $goodfaithGroup->conflictsWith(
- $categoryFilter,
-
'ores-rcfilters-ores-conflicts-hidecategorization-global',
-
'ores-rcfilters-goodfaith-conflicts-typeofchange',
-
'ores-rcfilters-hidecategorization-conflicts-ores'
);
$clsp->registerFilterGroup( $goodfaithGroup );
--
To view, visit https://gerrit.wikimedia.org/r/344667
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ief5bc777f029194998f7362c9dd92f9bbc5febbb
Gerrit-PatchSet: 4
Gerrit-Project: mediawiki/extensions/ORES
Gerrit-Branch: master
Gerrit-Owner: Mattflaschen <[email protected]>
Gerrit-Reviewer: Catrope <[email protected]>
Gerrit-Reviewer: Mooeypoo <[email protected]>
Gerrit-Reviewer: Siebrand <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
