(Go: >> BACK << -|- >> HOME <<)
Page MenuHomePhabricator
Create Task
Maniphest T324722

Refactor GlobalBlocking messages into smaller messages
Closed, ResolvedPublic5 Estimated Story Points
Actions

Description

Background

Similar to T324601: Refactor block messages into smaller messages, the following GlobalBlocking messages are long and difficult to maintain:

  • globalblocking-blockedtext-ip
  • globalblocking-blockedtext-range
  • globalblocking-blockedtext-xff
  • globalblocking-ipblocked
  • globalblocking-ipblocked-range
  • globalblocking-ipblocked-xff

Also, the last three of those messages should be replaced with the first three, as they are the same but with a different parameter order.

Acceptance criteria
  • These messages should be refactored in a similar way to those in core (T324601: Refactor block messages into smaller messages)
  • The messages globalblocking-ipblocked globalblocking-ipblocked-range and globalblocking-ipblocked-xff should be replaced by their newer counterparts
  • The overrides in WikimediaMessages should be updated accordingly

Details

SubjectRepoBranchLines +/-
Refactor Global Blocking error messages for claritymediawiki/extensions/WikimediaMessagesmaster+62 -10
Refactor Global Blocking error messages for claritymediawiki/extensions/WikimediaMessagesmaster+42 -10
Fix duplicate message keys in GlobalBlocking overridesmediawiki/extensions/WikimediaMessagesmaster+5 -21
Refactor block error messages for claritymediawiki/extensions/GlobalBlockingmaster+29 -13
Customize query in gerrit

Related Objects
Search...

Event Timeline

Tchanders created this task.Dec 8 2022, 12:07 AM
Tchanders set the point value for this task to 5.Dec 8 2022, 12:11 AM
Tchanders moved this task from Backlog to Ready / In Progress (TSP) on the Temporary accounts board.Dec 12 2022, 12:58 PM
STran claimed this task.Jan 3 2023, 8:49 PM
STran moved this task from Ready 🎬 (ONLY IF YOU HAVE NO MORE CODE TO REVIEW) to In Progress 💪 on the Anti-Harassment (AHaT Sprint 22: Asian Conical Hat) board.
STran removed STran as the assignee of this task.Jan 12 2023, 9:07 PM
STran subscribed.

Unlicking this cookie bc prioritized work came up.

STran moved this task from In Progress 💪 to Ready 🎬 (ONLY IF YOU HAVE NO MORE CODE TO REVIEW) on the Anti-Harassment (AHaT Sprint 22: Asian Conical Hat) board.Jan 12 2023, 9:07 PM
• AGueyte claimed this task.Jan 17 2023, 2:02 PM
• AGueyte moved this task from Ready 🎬 (ONLY IF YOU HAVE NO MORE CODE TO REVIEW) to In Progress 💪 on the Anti-Harassment (AHaT Sprint 22: Asian Conical Hat) board.Jan 17 2023, 2:23 PM
ARamirez_WMF edited projects, added Anti-Harassment (AHaT Sprint 23: Penguit Santa Hat); removed Anti-Harassment (AHaT Sprint 22: Asian Conical Hat).Jan 17 2023, 5:59 PM
ARamirez_WMF moved this task from Ready 🎬 (ONLY IF YOU HAVE NO MORE CODE TO REVIEW) to In Progress 💪 on the Anti-Harassment (AHaT Sprint 23: Penguit Santa Hat) board.
• AGueyte moved this task from In Progress 💪 to Ready 🎬 (ONLY IF YOU HAVE NO MORE CODE TO REVIEW) on the Anti-Harassment (AHaT Sprint 23: Penguit Santa Hat) board.Jan 17 2023, 6:41 PM

The ticket is on hold for a moment, but work on the refactoring has been done here:
https://docs.google.com/spreadsheets/d/1fBsiE5PI7r0ro2leiP93eDMOV5PfaQYOkat9ZjkzOvU/edit#gid=446640180

ARamirez_WMF edited projects, added Anti-Harassment (AHaT Sprint 24: The Toque Blanche Hat); removed Anti-Harassment (AHaT Sprint 23: Penguit Santa Hat).Jan 31 2023, 4:48 PM
• AGueyte moved this task from Ready 🎬 (ONLY IF YOU HAVE NO MORE CODE TO REVIEW) to In Progress 💪 on the Anti-Harassment (AHaT Sprint 24: The Toque Blanche Hat) board.Feb 1 2023, 5:00 PM
gerritbot added a comment.Feb 2 2023, 6:24 PM

Change 886126 had a related patch set uploaded (by AGueyte; author: AGueyte):

[mediawiki/extensions/GlobalBlocking@master] Refactor block error message into smaller ones

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

gerritbot added a project: Patch-For-Review.Feb 2 2023, 6:24 PM
gerritbot added a comment.Feb 3 2023, 1:09 AM

Change 886187 had a related patch set uploaded (by AGueyte; author: AGueyte):

[mediawiki/extensions/WikimediaMessages@master] Refactor Global Blocking error messages for clarity

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

• AGueyte moved this task from In Progress 💪 to Code Review 🔍 on the Anti-Harassment (AHaT Sprint 24: The Toque Blanche Hat) board.Feb 3 2023, 1:21 PM
ARamirez_WMF edited projects, added Anti-Harassment (AHaT Sprint 25: The Tengai Hat); removed Anti-Harassment (AHaT Sprint 24: The Toque Blanche Hat).Feb 14 2023, 5:54 PM
ARamirez_WMF moved this task from Ready 🎬 (ONLY IF YOU HAVE NO MORE CODE TO REVIEW) to Code Review 🔍 on the Anti-Harassment (AHaT Sprint 25: The Tengai Hat) board.
gerritbot added a comment.Feb 21 2023, 9:03 PM

Change 886187 merged by jenkins-bot:

[mediawiki/extensions/WikimediaMessages@master] Refactor Global Blocking error messages for clarity

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

ReleaseTaggerBot added a project: MW-1.40-notes (1.40.0-wmf.25; 2023-02-27).Feb 21 2023, 10:00 PM
Nikerabbit subscribed.Feb 22 2023, 10:04 AM

The patch to WikimediaMessages is causing problems for translatewiki.net. Please see gerrit for details.

• AGueyte moved this task from Code Review 🔍 to In Progress 💪 on the Anti-Harassment (AHaT Sprint 25: The Tengai Hat) board.Feb 22 2023, 5:39 PM
gerritbot added a comment.Feb 23 2023, 9:45 PM

Change 891654 had a related patch set uploaded (by AGueyte; author: AGueyte):

[mediawiki/extensions/WikimediaMessages@master] Refactor Global Blocking error messages for clarity

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

• AGueyte moved this task from In Progress 💪 to Code Review 🔍 on the Anti-Harassment (AHaT Sprint 25: The Tengai Hat) board.Feb 23 2023, 9:49 PM
ARamirez_WMF edited projects, added Anti-Harassment (AHaT Sprint 26: The Bycocket Hat); removed Anti-Harassment (AHaT Sprint 25: The Tengai Hat).Feb 28 2023, 6:29 PM
ARamirez_WMF moved this task from Ready 🎬 (ONLY IF YOU HAVE NO MORE CODE TO REVIEW) to Code Review 🔍 on the Anti-Harassment (AHaT Sprint 26: The Bycocket Hat) board.
gerritbot added a comment.Mar 13 2023, 4:42 PM

Change 886126 merged by jenkins-bot:

[mediawiki/extensions/GlobalBlocking@master] Refactor block error messages for clarity

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

ReleaseTaggerBot edited projects, added MW-1.40-notes (1.40.0-wmf.27; 2023-03-13); removed MW-1.40-notes (1.40.0-wmf.25; 2023-02-27).Mar 13 2023, 5:00 PM
Amire80 added a comment.Mar 14 2023, 9:25 AM

Thanks for more work on that!

Some more comments:

  • Instead of adding globalblocking-blockedtext-details-queries, you can probably reuse blockedtext-include-details-queries from core. Reusing messages is often not recommended, but in this case, I think it's OK.
  • "The block was made by", "The reason given is", "Start of block", and "Expiration of block" are also available in core, and can be reused in Global Blocking.
ARamirez_WMF edited projects, added Anti-Harassment (AHaT Sprint 27: The Big Yellow Hat); removed Anti-Harassment (AHaT Sprint 26: The Bycocket Hat).Mar 14 2023, 4:26 PM
ARamirez_WMF moved this task from Ready 🎬 (ONLY IF YOU HAVE NO MORE CODE TO REVIEW) to Code Review 🔍 on the Anti-Harassment (AHaT Sprint 27: The Big Yellow Hat) board.
gerritbot added a comment.Mar 15 2023, 3:05 PM

Change 891654 merged by jenkins-bot:

[mediawiki/extensions/WikimediaMessages@master] Refactor Global Blocking error messages for clarity

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

• AGueyte moved this task from Code Review 🔍 to QA/Testing 🐞 on the Anti-Harassment (AHaT Sprint 27: The Big Yellow Hat) board.Mar 15 2023, 3:09 PM
Maintenance_bot removed a project: Patch-For-Review.Mar 15 2023, 3:10 PM
Tchanders mentioned this in T332186: In GlobalBlocking block messages, re-use core messages.Mar 15 2023, 3:18 PM
Tchanders added a comment.Mar 15 2023, 3:44 PM

Bypassing QA since this has been checked by a lot of people already.

In T324722#8690798, @Amire80 wrote:

Thanks for more work on that!

Some more comments:

  • Instead of adding globalblocking-blockedtext-details-queries, you can probably reuse blockedtext-include-details-queries from core. Reusing messages is often not recommended, but in this case, I think it's OK.
  • "The block was made by", "The reason given is", "Start of block", and "Expiration of block" are also available in core, and can be reused in Global Blocking.

Thanks - filed as T332186: In GlobalBlocking block messages, re-use core messages

ReleaseTaggerBot added a project: MW-1.41-notes (1.41.0-wmf.1; 2023-03-20).Mar 15 2023, 4:01 PM
Tchanders moved this task from QA/Testing 🐞 to Done Q2 2022-2023 on the Anti-Harassment (AHaT Sprint 27: The Big Yellow Hat) board.Mar 15 2023, 4:29 PM
Amire80 added a comment.EditedMar 16 2023, 10:53 AM

The new messages wikimedia-globalblocking-blockedtext-mistake and wikimedia-globalblocking-blockedtext-mistake-email-steward look unnecessary because they are the same as in the extension.

Tchanders added a comment.Mar 17 2023, 2:54 PM
In T324722#8701769, @Amire80 wrote:

The new messages wikimedia-globalblocking-blockedtext-mistake and wikimedia-globalblocking-blockedtext-mistake-email-steward look unnecessary because they are the same as in the extension.

I think these are only defined in WikimediaMessages.

There are two similar sets of messages in wikimedia/en.json and wikimediaoverrides/en.json, which are used separately by different pathways in the GlobalBlocking extension. (This itself is some technical debt that should be cleaned up: T332402)

Amire80 added a comment.Mar 17 2023, 3:00 PM

It would be nice if you could clean it up as quickly as possible, because it currently causes some issues in translatewiki. Wikimedia-specific messages should probably be in the WikimediaMessages extension.

Tchanders added a comment.Mar 17 2023, 3:03 PM
In T324722#8705413, @Amire80 wrote:

It would be nice if you could clean it up as quickly as possible, because it currently causes some issues in translatewiki. Wikimedia-specific messages should probably be in the WikimediaMessages extension.

Just to be clear, the messages wikimedia-globalblocking-blockedtext-mistake and wikimedia-globalblocking-blockedtext-mistake-email-steward are not defined in the GlobalBlocking extension. Is this what you thought was causing issues?

If not, could you share more info on what the issues are or what might be causing them?

Nikerabbit added a comment.Mar 18 2023, 12:46 PM

Key 8:globalblocking-blockedtext-all-wikis already belongs to ext-globalblocking-user, conflict with ext-wikimediamessages
Key 8:globalblocking-blockedtext-ip-range already belongs to ext-globalblocking-user, conflict with ext-wikimediamessages
Key 8:globalblocking-blockedtext-on-proxy already belongs to ext-globalblocking-user, conflict with ext-wikimediamessages
Key 8:globalblocking-blockedtext-on-range already belongs to ext-globalblocking-user, conflict with ext-wikimediamessages
Key 8:globalblocking-blockedtext-proxy already belongs to ext-globalblocking-user, conflict with ext-wikimediamessages

Same message key is used in different extensions and at least in some cases with different values. Existing translations are getting "messed up" depending which definition of the message translators are seeing.

Amire80 added a comment.Mar 20 2023, 7:39 AM
In T324722#8705419, @Tchanders wrote:
In T324722#8705413, @Amire80 wrote:

It would be nice if you could clean it up as quickly as possible, because it currently causes some issues in translatewiki. Wikimedia-specific messages should probably be in the WikimediaMessages extension.

Just to be clear, the messages wikimedia-globalblocking-blockedtext-mistake and wikimedia-globalblocking-blockedtext-mistake-email-steward are not defined in the GlobalBlocking extension. Is this what you thought was causing issues?

If not, could you share more info on what the issues are or what might be causing them?

Oh, my mistake. But is it right that they appear both in Wikimedia Messages and Wikimedia Overrides? I'd guess that Wikimedia Messages is enough, but please correct me if I'm wrong.

gerritbot added a comment.Mar 20 2023, 10:39 AM

Change 901136 had a related patch set uploaded (by Tchanders; author: Tchanders):

[mediawiki/extensions/WikimediaMessages@master] Fix duplicate message keys in GlobalBlocking overrides

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

gerritbot added a project: Patch-For-Review.Mar 20 2023, 10:39 AM
Tchanders added a comment.Mar 20 2023, 10:56 AM
In T324722#8707232, @Nikerabbit wrote:

Key 8:globalblocking-blockedtext-all-wikis already belongs to ext-globalblocking-user, conflict with ext-wikimediamessages
Key 8:globalblocking-blockedtext-ip-range already belongs to ext-globalblocking-user, conflict with ext-wikimediamessages
Key 8:globalblocking-blockedtext-on-proxy already belongs to ext-globalblocking-user, conflict with ext-wikimediamessages
Key 8:globalblocking-blockedtext-on-range already belongs to ext-globalblocking-user, conflict with ext-wikimediamessages
Key 8:globalblocking-blockedtext-proxy already belongs to ext-globalblocking-user, conflict with ext-wikimediamessages

Same message key is used in different extensions and at least in some cases with different values. Existing translations are getting "messed up" depending which definition of the message translators are seeing.

Thanks - this should be fixed in https://gerrit.wikimedia.org/r/901136 which removes these messages, since they were unnecessary.

In T324722#8708669, @Amire80 wrote:
Oh, my mistake. But is it right that they appear both in Wikimedia Messages and Wikimedia Overrides? I'd guess that Wikimedia Messages is enough, but please correct me if I'm wrong.

Good point - the patch also removes these from wikimedia/en.json

gerritbot added a comment.Mar 20 2023, 2:31 PM

Change 901136 merged by jenkins-bot:

[mediawiki/extensions/WikimediaMessages@master] Fix duplicate message keys in GlobalBlocking overrides

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

Maintenance_bot removed a project: Patch-For-Review.Mar 20 2023, 3:11 PM
Amire80 added a comment.Mar 23 2023, 1:15 PM

wikimedia-globalblocking-blockedtext-details-queries and blockedtext-include-details-queries are identical. If there's no intention to make a special version of this message for Wikimedia sites, then wikimedia-globalblocking-blockedtext-details-queries should probably be removed.

Tchanders added a comment.Mar 27 2023, 5:40 PM
In T324722#8721067, @Amire80 wrote:

wikimedia-globalblocking-blockedtext-details-queries and blockedtext-include-details-queries are identical. If there's no intention to make a special version of this message for Wikimedia sites, then wikimedia-globalblocking-blockedtext-details-queries should probably be removed.

Fixed in https://gerrit.wikimedia.org/r/c/mediawiki/extensions/WikimediaMessages/+/903315

Tchanders closed this task as Resolved.Apr 11 2023, 9:30 PM
Content licensed under Creative Commons Attribution-ShareAlike (CC BY-SA) 4.0 unless otherwise noted; code licensed under GNU General Public License (GPL) 2.0 or later and other open source licenses. By using this site, you agree to the Terms of Use, Privacy Policy, and Code of Conduct. · Wikimedia Foundation · Privacy Policy · Code of Conduct · Terms of Use · Disclaimer · CC-BY-SA · GPL