From 535d316839f8dc3bddb9a473f07d980b0f974d7a Mon Sep 17 00:00:00 2001 From: Hazelnoot Date: Sat, 10 May 2025 21:39:25 -0400 Subject: [PATCH 1/2] add warning banner about word mute limitations --- locales/index.d.ts | 4 ++++ packages/frontend/src/pages/settings/mute-block.vue | 5 +++++ sharkey-locales/en-US.yml | 1 + 3 files changed, 10 insertions(+) diff --git a/locales/index.d.ts b/locales/index.d.ts index df6efe0d6a..f062dfe6e3 100644 --- a/locales/index.d.ts +++ b/locales/index.d.ts @@ -13053,6 +13053,10 @@ export interface Locale extends ILocale { * Timeout in milliseconds for translation API requests. */ "translationTimeoutCaption": string; + /** + * Except for regular expressions, all word mutes are *case-sensitive* and match on any substring, including part of a longer word or name. + */ + "wordMuteWarning": string; } declare const locales: { [lang: string]: Locale; diff --git a/packages/frontend/src/pages/settings/mute-block.vue b/packages/frontend/src/pages/settings/mute-block.vue index 257ed3edd8..8cc3945df8 100644 --- a/packages/frontend/src/pages/settings/mute-block.vue +++ b/packages/frontend/src/pages/settings/mute-block.vue @@ -22,6 +22,8 @@ SPDX-License-Identifier: AGPL-3.0-only
{{ i18n.ts.wordMuteDescription }} + {{ i18n.ts.wordMuteWarning }} + {{ i18n.ts.hardWordMuteDescription }} + + {{ i18n.ts.wordMuteWarning }} +
diff --git a/sharkey-locales/en-US.yml b/sharkey-locales/en-US.yml index 93e178c636..b9ec49753a 100644 --- a/sharkey-locales/en-US.yml +++ b/sharkey-locales/en-US.yml @@ -560,6 +560,7 @@ wordMuteTestTest: "Test" wordMuteTestMatch: "Matched words: {words}" wordMuteTestNoResults: "No results yet, enter some text and click \"Test\" to check it." wordMuteTestNoMatch: "Text does not match any patterns." +wordMuteWarning: "Except for regular expressions, all word mutes are *case-sensitive* and match on any substring, including part of a longer word or name." bubbleTimeline: "Bubble timeline" bubbleTimelineDescription: "Choose which instances should be displayed in the bubble." From c47a6937e55ea1faeda4a0f7af3beadbdf02b67f Mon Sep 17 00:00:00 2001 From: Hazelnoot Date: Mon, 12 May 2025 13:43:41 -0400 Subject: [PATCH 2/2] clarify word mute warning --- locales/index.d.ts | 8 ++++---- sharkey-locales/en-US.yml | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/locales/index.d.ts b/locales/index.d.ts index f062dfe6e3..89426a52f0 100644 --- a/locales/index.d.ts +++ b/locales/index.d.ts @@ -13033,6 +13033,10 @@ export interface Locale extends ILocale { * Text does not match any patterns. */ "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 */ @@ -13053,10 +13057,6 @@ export interface Locale extends ILocale { * Timeout in milliseconds for translation API requests. */ "translationTimeoutCaption": string; - /** - * Except for regular expressions, all word mutes are *case-sensitive* and match on any substring, including part of a longer word or name. - */ - "wordMuteWarning": string; } declare const locales: { [lang: string]: Locale; diff --git a/sharkey-locales/en-US.yml b/sharkey-locales/en-US.yml index b9ec49753a..e85edf4425 100644 --- a/sharkey-locales/en-US.yml +++ b/sharkey-locales/en-US.yml @@ -560,7 +560,7 @@ wordMuteTestTest: "Test" wordMuteTestMatch: "Matched words: {words}" wordMuteTestNoResults: "No results yet, enter some text and click \"Test\" to check it." wordMuteTestNoMatch: "Text does not match any patterns." -wordMuteWarning: "Except for regular expressions, all word mutes are *case-sensitive* and match on any substring, including part of a longer word or name." +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" bubbleTimelineDescription: "Choose which instances should be displayed in the bubble."