Page MenuHomePhabricator

Implement conflict state between Non-Minor Edits and Wikidata (and remove conflict between Minor Edits and Wikidata)
Closed, ResolvedPublic

Description

Contrary to what was specified in T160803, there is no conflict between Minor Edits and Wikidata Edits. The conflict is actually between Non-Minor edits and Wikidata Edits. Please:

  1. Implement the new conflict, using the messages below.
  2. Remove the conflict involving Minor edits and Wikidata.

I updated T160803 and T149385 with the correct language. On T160803 I used strikethrough and highlighting to show where the changes took place.

Tooltip text

[Non-Minor Edits vs. Wikidata]

[rollover for Wikidata filter AND the Non-Minor Edits filter when they are in conflict]
On the Recent Changes page (only), all Wikidata edits are designated as “minor.” So the “Wikidata edits” filter conflicts with the “Non-minor edits” filter.

[Results Area text:

[Non-Minor Edits vs. Wikidata]

No results found because the search criteria are in conflict
On the Recent Changes page (only), all Wikidata edits are designated as “minor.” So the “Wikidata edits” filter conflicts with the “Non-minor edits” filter.

Event Timeline

Change 345855 had a related patch set uploaded (by Sbisson):
[mediawiki/core@master] [wip] RC Filters: messages for conflict between major and type of change

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

Change 345855 abandoned by Sbisson:
[wip] RC Filters: messages for conflict between major and type of change

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

Change 344451 had a related patch set uploaded (by Sbisson; owner: Catrope):
[mediawiki/extensions/Wikibase@master] RCFilters: Make Wikidata filter conflict with non-minor edits

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

There's a discussion about the language on the patch. I'm copying it here so @jmatazzoni can participate.

On the Recent Changes page (only), all Wikidata edits are designated as “minor.” So the “Wikidata edits” filter conflicts with the “Non-minor edits” filter.

Hoo man said: "This sounds weird to me. Maybe word it like "On this Wiki, all … edits are … minor …"? This feature is not active on the repo, even if it's a client."

@Catrope replied: "I agree that we should remove the "On the Recent Changes page (only)" bit. If anything, we could rearrange the sentence and just use the word "here"."

Change 344451 merged by jenkins-bot:
[mediawiki/extensions/Wikibase@master] RCFilters: Make Wikidata filter conflict with non-minor edits

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

Change 344451 merged by jenkins-bot:
[mediawiki/extensions/Wikibase@master] RCFilters: Make Wikidata filter conflict with non-minor edits
https://gerrit.wikimedia.org/r/344451

This was merged but it was never working correctly for me. The messages were not being loaded correctly and the conflict state was showing <msg-key-here> in the UI. @Catrope, @Mattflaschen-WMF Are you setup to test wikidata conflicts locally? Could you take a look?

It looks right for me (without running anything special).

Try:

mwscript rebuildLocalisationCache.php

Checked the conflicting filters 'Wikidata edits' and ' and 'Non-minor edits' in betalabs:

QA Recommendation: Resolve

jmatazzoni closed this task as Resolved.Apr 18 2017, 12:26 AM