Mirrors/gitea
0
0
Fork 0
mirror of https://github.com/go-gitea/gitea.git synced 2026-05-07 12:33:36 +02:00
Code Issues Activity

Add URL to Learn more about blocking a user. (#37355) (#37367)

Browse Source 
Backport #37355 by @PineBale

Closes #29992

<img width="1308" height="828" alt="1"
src="https://github.com/user-attachments/assets/552c2e0f-8da6-4f71-8660-8e3f5a78ace5"
/>

Co-authored-by: PineBale <272794187+PineBale@users.noreply.github.com>
This commit is contained in:
Giteabot 2026-04-23 02:38:05 +08:00 committed by GitHub
parent fc9dfe0e56
commit a8e465e893
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 4 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
options/locale/locale_en-US.json
View File

@ -637,14 +637,8 @@
"user.block.unblock.failure": "Failed to unblock user: %s", "user.block.unblock.failure": "Failed to unblock user: %s",
"user.block.blocked": "You have blocked this user.", "user.block.blocked": "You have blocked this user.",
"user.block.title": "Block a 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": "Blocking a user prevents them from interacting with repositories, such as opening or commenting on pull requests or issues.",
"user.block.info_1": "Blocking a user prevents the following actions on your account and your repositories:", "user.block.info.docs": "Learn more about blocking a user.",
"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.user_to_block": "User to block", "user.block.user_to_block": "User to block",
"user.block.note": "Note", "user.block.note": "Note",
"user.block.note.title": "Optional note:", "user.block.note.title": "Optional note:",

2
templates/shared/user/block_user_dialog.tmpl
View File

@ -1,7 +1,7 @@
<div class="ui small modal" id="block-user-modal"> <div class="ui small modal" id="block-user-modal">
<div class="header">{{ctx.Locale.Tr "user.block.title"}}</div> <div class="header">{{ctx.Locale.Tr "user.block.title"}}</div>
<div class="content"> <div class="content">
<div class="ui warning message">{{ctx.Locale.Tr "user.block.info"}}</div> <div class="ui warning message">{{ctx.Locale.Tr "user.block.info"}} <a target="_blank" href="https://docs.gitea.com/usage/access-control/blocking-user">{{ctx.Locale.Tr "user.block.info.docs"}}</a></div>
<form class="ui form modal-form" method="post"> <form class="ui form modal-form" method="post">
<input type="hidden" name="action" value="block" /> <input type="hidden" name="action" value="block" />
<input type="hidden" name="blockee" class="modal-blockee" /> <input type="hidden" name="blockee" class="modal-blockee" />

10
templates/shared/user/blocked_users.tmpl
View File

@ -2,15 +2,7 @@
{{ctx.Locale.Tr "user.block.title"}} {{ctx.Locale.Tr "user.block.title"}}
</h4> </h4>
<div class="ui attached segment"> <div class="ui attached segment">
<p>{{ctx.Locale.Tr "user.block.info_1"}}</p> <p>{{ctx.Locale.Tr "user.block.info"}} <a target="_blank" href="https://docs.gitea.com/usage/access-control/blocking-user">{{ctx.Locale.Tr "user.block.info.docs"}}</a></p>
<ul>
<li>{{ctx.Locale.Tr "user.block.info_2"}}</li>
<li>{{ctx.Locale.Tr "user.block.info_3"}}</li>
<li>{{ctx.Locale.Tr "user.block.info_4"}}</li>
<li>{{ctx.Locale.Tr "user.block.info_5"}}</li>
<li>{{ctx.Locale.Tr "user.block.info_6"}}</li>
<li>{{ctx.Locale.Tr "user.block.info_7"}}</li>
</ul>
</div> </div>
<div class="ui segment"> <div class="ui segment">
<form class="ui form ignore-dirty" action="{{$.Link}}" method="post"> <form class="ui form ignore-dirty" action="{{$.Link}}" method="post">