summaryrefslogtreecommitdiff
path: root/packages/frontend/src/components
diff options
context:
space:
mode:
authorHazelnoot <acomputerdog@gmail.com>2024-12-15 16:46:23 +0000
committerHazelnoot <acomputerdog@gmail.com>2024-12-15 16:46:23 +0000
commitdfcba23e0bbd5099cd29fc96f1216968fb056418 (patch)
tree6e35b6b3e8408cc21b150fdc5cf716a7daf7291c /packages/frontend/src/components
parentmerge: Fix notifications breaking due to deleted role being assigned (!816) (diff)
parentrevert forced editor eslint formatting (diff)
downloadsharkey-dfcba23e0bbd5099cd29fc96f1216968fb056418.tar.gz
sharkey-dfcba23e0bbd5099cd29fc96f1216968fb056418.tar.bz2
sharkey-dfcba23e0bbd5099cd29fc96f1216968fb056418.zip
merge: Add locales and new navbar entry (!815)
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/815 Approved-by: dakkar <dakkar@thenautilus.net> Approved-by: Hazelnoot <acomputerdog@gmail.com>
Diffstat (limited to 'packages/frontend/src/components')
-rw-r--r--packages/frontend/src/components/MkNoteSimple.vue2
-rw-r--r--packages/frontend/src/components/MkScheduleEditor.vue2
2 files changed, 2 insertions, 2 deletions
diff --git a/packages/frontend/src/components/MkNoteSimple.vue b/packages/frontend/src/components/MkNoteSimple.vue
index 924262d62e..a369d84783 100644
--- a/packages/frontend/src/components/MkNoteSimple.vue
+++ b/packages/frontend/src/components/MkNoteSimple.vue
@@ -16,7 +16,7 @@ SPDX-License-Identifier: AGPL-3.0-only
<div v-show="note.cw == null || showContent">
<MkSubNoteContent :hideFiles="hideFiles" :class="$style.text" :note="note" :expandAllCws="props.expandAllCws"/>
<div v-if="note.isSchedule" style="margin-top: 10px;">
- <MkButton :class="$style.button" inline @click.stop.prevent="editScheduleNote()"><i class="ti ti-eraser"></i> {{ i18n.ts.deleteAndEdit }}</MkButton>
+ <MkButton :class="$style.button" inline @click.stop.prevent="editScheduleNote()"><i class="ti ti-eraser"></i> {{ i18n.ts.edit }}</MkButton>
<MkButton :class="$style.button" inline danger @click.stop.prevent="deleteScheduleNote()"><i class="ti ti-trash"></i> {{ i18n.ts.delete }}</MkButton>
</div>
</div>
diff --git a/packages/frontend/src/components/MkScheduleEditor.vue b/packages/frontend/src/components/MkScheduleEditor.vue
index 60a60bed28..f40d37c962 100644
--- a/packages/frontend/src/components/MkScheduleEditor.vue
+++ b/packages/frontend/src/components/MkScheduleEditor.vue
@@ -7,7 +7,7 @@ SPDX-License-Identifier: AGPL-3.0-only
<div style="padding: 8px 16px;">
<section>
<MkInput v-model="atDate" small type="date" class="input">
- <template #label>{{ i18n.ts._poll.deadlineDate }}</template>
+ <template #label>{{ i18n.ts.postOn }}</template>
</MkInput>
<MkInput v-model="atTime" small type="time" class="input">
<template #label>{{ i18n.ts._poll.deadlineTime }}</template>