summaryrefslogtreecommitdiff
path: root/packages
diff options
context:
space:
mode:
authorMarie <github@yuugi.dev>2024-09-19 15:59:59 +0000
committerMarie <github@yuugi.dev>2024-09-19 15:59:59 +0000
commitbc02b4ae1fb53fa55210c9383baed5f70fb2bf21 (patch)
tree536841653877ccc13a5b2670aba2f8b7a4f200f3 /packages
parentmerge: refactor: Use proper logging facilities in WebfingerService (!615) (diff)
parentfix: use i18n in settings (diff)
downloadsharkey-bc02b4ae1fb53fa55210c9383baed5f70fb2bf21.tar.gz
sharkey-bc02b4ae1fb53fa55210c9383baed5f70fb2bf21.tar.bz2
sharkey-bc02b4ae1fb53fa55210c9383baed5f70fb2bf21.zip
merge: fix: use i18n in settings/general.vue (!626)
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/626 Closes #541 Approved-by: dakkar <dakkar@thenautilus.net> Approved-by: Marie <github@yuugi.dev>
Diffstat (limited to 'packages')
-rw-r--r--packages/frontend/src/pages/settings/general.vue6
1 files changed, 3 insertions, 3 deletions
diff --git a/packages/frontend/src/pages/settings/general.vue b/packages/frontend/src/pages/settings/general.vue
index 75afe67be7..637c1b24b9 100644
--- a/packages/frontend/src/pages/settings/general.vue
+++ b/packages/frontend/src/pages/settings/general.vue
@@ -56,8 +56,8 @@ SPDX-License-Identifier: AGPL-3.0-only
</MkSwitch>
<MkSwitch v-model="collapseNotesRepliedTo">{{ i18n.ts.collapseNotesRepliedTo }}</MkSwitch>
<MkSwitch v-model="collapseFiles">{{ i18n.ts.collapseFiles }}</MkSwitch>
- <MkSwitch v-model="uncollapseCW">Uncollapse CWs on notes</MkSwitch>
- <MkSwitch v-model="expandLongNote">Always expand long notes</MkSwitch>
+ <MkSwitch v-model="uncollapseCW">{{ i18n.ts.uncollapseCW }}</MkSwitch>
+ <MkSwitch v-model="expandLongNote">{{ i18n.ts.expandLongNote }}</MkSwitch>
<MkSwitch v-model="showNoteActionsOnlyHover">{{ i18n.ts.showNoteActionsOnlyHover }}</MkSwitch>
<MkSwitch v-model="showClipButtonInNoteFooter">{{ i18n.ts.showClipButtonInNoteFooter }}</MkSwitch>
<MkSwitch v-model="autoloadConversation">{{ i18n.ts.autoloadConversation }}</MkSwitch>
@@ -67,7 +67,7 @@ SPDX-License-Identifier: AGPL-3.0-only
<MkSwitch v-model="showReactionsCount">{{ i18n.ts.showReactionsCount }}</MkSwitch>
<MkSwitch v-model="showGapBetweenNotesInTimeline">{{ i18n.ts.showGapBetweenNotesInTimeline }}</MkSwitch>
<MkSwitch v-model="loadRawImages">{{ i18n.ts.loadRawImages }}</MkSwitch>
- <MkSwitch v-model="showTickerOnReplies">Show instance ticker on replies</MkSwitch>
+ <MkSwitch v-model="showTickerOnReplies">{{ i18n.ts.showTickerOnReplies }}</MkSwitch>
<MkSelect v-model="searchEngine" placeholder="Other">
<template #label>{{ i18n.ts.searchEngine }}</template>
<option