diff --git a/locales/index.d.ts b/locales/index.d.ts index dc41c96a96..5cbe918183 100644 --- a/locales/index.d.ts +++ b/locales/index.d.ts @@ -13029,6 +13029,18 @@ export interface Locale extends ILocale { * Text does not match any patterns. */ "wordMuteTestNoMatch": string; + /** + * Bubble timeline + */ + "bubbleTimeline": string; + /** + * Choose which instances should be displayed in the bubble. + */ + "bubbleTimelineDescription": string; + /** + * Note: the bubble timeline is hidden by default, and must be enabled via roles. + */ + "bubbleTimelineMustBeEnabled": string; } declare const locales: { [lang: string]: Locale; diff --git a/packages/frontend/src/pages/admin/moderation.vue b/packages/frontend/src/pages/admin/moderation.vue index 6845bd7ad0..2213890d14 100644 --- a/packages/frontend/src/pages/admin/moderation.vue +++ b/packages/frontend/src/pages/admin/moderation.vue @@ -26,15 +26,19 @@ SPDX-License-Identifier: AGPL-3.0-only {{ i18n.ts.serverRules }} - - + - +
+
+ {{ i18n.ts.bubbleTimelineMustBeEnabled }} +
+ - + + {{ i18n.ts.save }}
@@ -179,11 +183,11 @@ import MkButton from '@/components/MkButton.vue'; import FormLink from '@/components/form/link.vue'; import MkFolder from '@/components/MkFolder.vue'; import SkPatternTest from '@/components/SkPatternTest.vue'; +import { $i } from '@/i'; const enableRegistration = ref(false); const emailRequiredForSignup = ref(false); const approvalRequiredForSignup = ref(false); -const bubbleTimelineEnabled = ref(false); const sensitiveWords = ref(''); const prohibitedWords = ref(''); const prohibitedWordsForNameOfUser = ref(''); @@ -206,7 +210,6 @@ async function init() { hiddenTags.value = meta.hiddenTags.join('\n'); preservedUsernames.value = meta.preservedUsernames.join('\n'); bubbleTimeline.value = meta.bubbleInstances.join('\n'); - bubbleTimelineEnabled.value = meta.policies.btlAvailable; trustedLinkUrlPatterns.value = meta.trustedLinkUrlPatterns.join('\n'); blockedHosts.value = meta.blockedHosts.join('\n'); silencedHosts.value = meta.silencedHosts?.join('\n') ?? ''; diff --git a/sharkey-locales/en-US.yml b/sharkey-locales/en-US.yml index 9232a7706c..af60fb2a61 100644 --- a/sharkey-locales/en-US.yml +++ b/sharkey-locales/en-US.yml @@ -559,3 +559,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." + +bubbleTimeline: "Bubble timeline" +bubbleTimelineDescription: "Choose which instances should be displayed in the bubble." +bubbleTimelineMustBeEnabled: "Note: the bubble timeline is hidden by default, and must be enabled via roles."