mirrors/barkey
1
0
Fork 0
mirror of https://codeberg.org/yeentown/barkey.git synced 2025-07-07 20:44:34 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

merge: Add warning banner about word mute limitations (resolves #784) (!1017)

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

Closes #784

Approved-by: Marie <github@yuugi.dev>
Approved-by: dakkar <dakkar@thenautilus.net>
This commit is contained in:
Hazelnoot 2025-05-23 11:14:15 +00:00
commit 639556201a
3 changed files with 10 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
locales/index.d.ts vendored
View file

@ -13045,6 +13045,10 @@ export interface Locale extends ILocale {
* Text does not match any patterns. * Text does not match any patterns.
*/ */
"wordMuteTestNoMatch": string; "wordMuteTestNoMatch": string;
/**
* All word mutes are *case-sensitive* and match on any substring, including part of a longer word or name. You can use regular expressions for more precise control.
*/
"wordMuteWarning": string;
/** /**
* Bubble timeline * Bubble timeline
*/ */

5
packages/frontend/src/pages/settings/mute-block.vue
View file

@ -22,6 +22,8 @@ SPDX-License-Identifier: AGPL-3.0-only
<div class="_gaps_m"> <div class="_gaps_m">
<MkInfo>{{ i18n.ts.wordMuteDescription }}</MkInfo> <MkInfo>{{ i18n.ts.wordMuteDescription }}</MkInfo>
<MkInfo warn>{{ i18n.ts.wordMuteWarning }}</MkInfo>
<SearchMarker <SearchMarker
:label="i18n.ts.showMutedWord" :label="i18n.ts.showMutedWord"
:keywords="['show']" :keywords="['show']"
@ -44,6 +46,9 @@ SPDX-License-Identifier: AGPL-3.0-only
<div class="_gaps_m"> <div class="_gaps_m">
<MkInfo>{{ i18n.ts.hardWordMuteDescription }}</MkInfo> <MkInfo>{{ i18n.ts.hardWordMuteDescription }}</MkInfo>
<MkInfo warn>{{ i18n.ts.wordMuteWarning }}</MkInfo>
<XWordMute :muted="$i.hardMutedWords" @save="saveHardMutedWords"/> <XWordMute :muted="$i.hardMutedWords" @save="saveHardMutedWords"/>
</div> </div>
</MkFolder> </MkFolder>

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

@ -563,6 +563,7 @@ wordMuteTestTest: "Test"
wordMuteTestMatch: "Matched words: {words}" wordMuteTestMatch: "Matched words: {words}"
wordMuteTestNoResults: "No results yet, enter some text and click \"Test\" to check it." wordMuteTestNoResults: "No results yet, enter some text and click \"Test\" to check it."
wordMuteTestNoMatch: "Text does not match any patterns." wordMuteTestNoMatch: "Text does not match any patterns."
wordMuteWarning: "All word mutes are *case-sensitive* and match on any substring, including part of a longer word or name. You can use regular expressions for more precise control."
bubbleTimeline: "Bubble timeline" bubbleTimeline: "Bubble timeline"
bubbleTimelineDescription: "Choose which instances should be displayed in the bubble." bubbleTimelineDescription: "Choose which instances should be displayed in the bubble."