From a8e465e893b6efe0184e68f2e6dfaeb3e60c5678 Mon Sep 17 00:00:00 2001 From: Giteabot Date: Thu, 23 Apr 2026 02:38:05 +0800 Subject: [PATCH] Add URL to `Learn more about blocking a user.` (#37355) (#37367) Backport #37355 by @PineBale Closes #29992 1 Co-authored-by: PineBale <272794187+PineBale@users.noreply.github.com> --- options/locale/locale_en-US.json | 10 ++-------- templates/shared/user/block_user_dialog.tmpl | 2 +- templates/shared/user/blocked_users.tmpl | 10 +--------- 3 files changed, 4 insertions(+), 18 deletions(-) diff --git a/options/locale/locale_en-US.json b/options/locale/locale_en-US.json index b9d5247b3d..d6c733b50b 100644 --- a/options/locale/locale_en-US.json +++ b/options/locale/locale_en-US.json @@ -637,14 +637,8 @@ "user.block.unblock.failure": "Failed to unblock user: %s", "user.block.blocked": "You have blocked this user.", "user.block.title": "Block a user", - "user.block.info": "Blocking a user prevents them from interacting with repositories, such as opening or commenting on pull requests or issues. Learn more about blocking a user.", - "user.block.info_1": "Blocking a user prevents the following actions on your account and your repositories:", - "user.block.info_2": "following your account", - "user.block.info_3": "send you notifications by @mentioning your username", - "user.block.info_4": "inviting you as a collaborator to their repositories", - "user.block.info_5": "starring, forking or watching on repositories", - "user.block.info_6": "opening and commenting on issues or pull requests", - "user.block.info_7": "reacting to your comments in issues or pull requests", + "user.block.info": "Blocking a user prevents them from interacting with repositories, such as opening or commenting on pull requests or issues.", + "user.block.info.docs": "Learn more about blocking a user.", "user.block.user_to_block": "User to block", "user.block.note": "Note", "user.block.note.title": "Optional note:", diff --git a/templates/shared/user/block_user_dialog.tmpl b/templates/shared/user/block_user_dialog.tmpl index 33b85eddae..bc2b454b4e 100644 --- a/templates/shared/user/block_user_dialog.tmpl +++ b/templates/shared/user/block_user_dialog.tmpl @@ -1,7 +1,7 @@