misty.cafe/mistykey
1
0
Fork 0
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions

merge: Expand Mandatory CW feature and fixup block/mute/silence features (resolves #809, #910, #912, #943, #1064, #1142, and #1186) (!1148)

Browse source 
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/1148

Closes #809, #910, #912, #943, #1064, #1142, and #1186

Approved-by: dakkar <dakkar@thenautilus.net>
Approved-by: Marie <github@yuugi.dev>
This commit is contained in:
Marie 2025-09-25 20:05:46 +02:00
commit 741e612508
125 changed files with 3195 additions and 1338 deletions
Download patch file Download diff file Expand all files Collapse all files

2
sharkey-locales/de-DE.yml
View file

@ -221,8 +221,6 @@ _moderationLogTypes:
approve: "Genehmigt"
decline: "Abgelehnt"
setMandatoryCW: "Inhaltswarnung für Benutzer gesetzt"
setRemoteInstanceNSFW: "Fremde Instanz als NSFW markiert"
unsetRemoteInstanceNSFW: "NSFW-Markierung für fremde Instanz entfernt"
rejectRemoteInstanceReports: "Meldungen von fremder Instanz abgelehnt"
acceptRemoteInstanceReports: "Meldungen von fremder Instanz akzeptiert"
rejectQuotesUser: "Zitate von Benutzer gesperrt/entfernt"

17
sharkey-locales/en-US.yml
View file

@ -35,6 +35,11 @@ muteNote: "Mute note"
unmuteNote: "Unmute note"
userSaysSomethingInMutedNote: "{name} said something in a muted post"
userSaysSomethingInMutedThread: "{name} said something in a muted thread"
silencedUserSaysSomething: "{name} has been silenced by {host} staff"
silencedInstanceSaysSomething: "{name} has been silenced by {host} staff"
userIsFlaggedAs: "{name} is flagged: \"{cw}\""
noteIsFlaggedAs: "Note is flagged: \"{cw}\""
instanceIsFlaggedAs: "{name} is flagged: \"{cw}\""
markAsNSFW: "Mark all media from user as NSFW"
markInstanceAsNSFW: "Mark as NSFW"
nsfwConfirm: "Are you sure that you want to mark all media from this account as NSFW?"
@ -346,8 +351,8 @@ _moderationLogTypes:
approve: "Approved"
decline: "Declined"
setMandatoryCW: "Set content warning for user"
setRemoteInstanceNSFW: "Set remote instance as NSFW"
unsetRemoteInstanceNSFW: "Unset remote instance as NSFW"
setMandatoryCWForNote: "Set content warning for note"
setMandatoryCWForInstance: "Set content warning for instance"
rejectRemoteInstanceReports: "Rejected reports from remote instance"
acceptRemoteInstanceReports: "Accepted reports from remote instance"
rejectQuotesUser: "Blocked/Stripped quote posts from user"
@ -506,6 +511,8 @@ _permissions:
"write:admin:nsfw-user": "Mark users as NSFW"
"write:admin:unnsfw-user": "Mark users as not NSFW"
"write:admin:cw-user": "Apply mandatory CW on users"
"write:admin:cw-note": "Apply mandatory CW on notes"
"write:admin:cw-instance": "Apply mandatory CW on instances"
"write:admin:silence-user": "Silence users"
"write:admin:unsilence-user": "Un-silence users"
"write:admin:reject-quotes": "Allow/Prohibit quote posts from a user"
@ -544,7 +551,11 @@ _noteSearch:
id: "ID"
mandatoryCW: "Force content warning"
mandatoryCWDescription: "Applies a content warning to all posts created by this user. If the post already has a CW, then this is appended to the end."
mandatoryCWDescription: "Applies a content warning to all posts created by this user. The forced warnings will appear like a word mute to distinguish them from the author's own content warnings."
mandatoryCWForNote: "Force content warning"
mandatoryCWForNoteDescription: "Applies an additional content warning to this post. The new warning will appear like a word mute to distinguish it from the author's own content warning."
mandatoryCWForInstance: "Force content warning"
mandatoryCWForInstanceDescription: "Applies a content warning to all posts originating from this instance. The forced warnings will appear like a word mute to distinguish them from the notes' own content warnings."
fetchLinkedNote: "Fetch linked note"
showTranslationButtonInNoteFooter: "Add \"Translate\" to note action menu"
translationFailed: "Failed to translate note. Please try again later or contact an administrator for assistance."

2
sharkey-locales/ja-JP.yml
View file

@ -277,8 +277,6 @@ _abuseReport:
webhook: "指定したSystemWebhookに通知を送ります(通報を受けた時と通報を解決した時にそれぞれ発信)"
_moderationLogTypes:
approve: "承認済み"
setRemoteInstanceNSFW: "Set remote instance as NSFW"
unsetRemoteInstanceNSFW: "Set remote instance as NSFW"
rejectRemoteInstanceReports: "Rejected reports from remote instance"
acceptRemoteInstanceReports: "Accepted reports from remote instance"
_mfm:

2
sharkey-locales/th-TH.yml
View file

@ -46,8 +46,6 @@ _moderationLogTypes:
approve: "ที่ได้รับการอนุมัติ"
decline: "ปฏิเสธ"
setMandatoryCW: "ตั้งค่าคำเตือนเนื้อหาสำหรับผู้ใช้"
setRemoteInstanceNSFW: "ตั้งค่าเซิร์ฟเวอร์ระยะไกลเป็น NSFW"
unsetRemoteInstanceNSFW: "ปิดการใช้งานการตั้งค่าเซิร์ฟเวอร์ระยะไกลเป็น NSFW"
rejectRemoteInstanceReports: "รายงานถูกปฏิเสธจากเซิร์ฟเวอร์ระยะไกล"
acceptRemoteInstanceReports: "รายงานได้รับการยอมรับจากเซิร์ฟเวอร์ระยะไกล"
rejectQuotesUser: "โพสต์คำพูดของผู้ใช้ถูกบล็อค/ลบ"

2
sharkey-locales/vi-VN.yml
View file

@ -41,8 +41,6 @@ _moderationLogTypes:
approve: "Đã chấp thuận"
decline: "Từ chối"
setMandatoryCW: "Đặt cảnh báo nội dung cho người dùng"
setRemoteInstanceNSFW: "Đặt máy chủ từ xa thành NSFW"
unsetRemoteInstanceNSFW: "Hủy cài đặt máy chủ từ xa thành NSFW"
rejectRemoteInstanceReports: "Báo cáo bị từ chối từ máy chủ từ xa"
acceptRemoteInstanceReports: "Đã chấp nhận báo cáo từ máy chủ từ xa"
rejectQuotesUser: "Đã chặn/Xóa bài đăng trích dẫn của người dùng"