diff --git a/frontend/components/Domain/Announcement/AnnouncementDialog.vue b/frontend/components/Domain/Announcement/AnnouncementDialog.vue
index f50629c6a..a6a5ccdd8 100644
--- a/frontend/components/Domain/Announcement/AnnouncementDialog.vue
+++ b/frontend/components/Domain/Announcement/AnnouncementDialog.vue
@@ -3,6 +3,7 @@
v-model="dialog"
:title="$t('announcements.announcements')"
:icon="$globals.icons.bullhornVariant"
+ :cancel-text="$t('general.done')"
width="100%"
max-width="1200"
>
@@ -44,7 +45,7 @@ watch(
async function setLastRead(key: string) {
const user = auth.user.value!;
- if (user.lastReadAnnouncement && key < user.lastReadAnnouncement) {
+ if (user.lastReadAnnouncement && key <= user.lastReadAnnouncement) {
// Don't update the last read announcement if it's older than the current one
return;
}
diff --git a/frontend/components/global/BaseDialog.vue b/frontend/components/global/BaseDialog.vue
index 468f2df20..038cbe0d6 100644
--- a/frontend/components/global/BaseDialog.vue
+++ b/frontend/components/global/BaseDialog.vue
@@ -51,7 +51,7 @@
emit('cancel');
"
>
- {{ $t("general.cancel") }}
+ {{ cancelText }}
@@ -116,10 +116,16 @@ interface DialogProps {
maxWidth?: number | string | null;
loading?: boolean;
top?: boolean | null;
+ keepOpen?: boolean;
+
+ // submit
submitIcon?: string | null;
submitText?: string;
submitDisabled?: boolean;
- keepOpen?: boolean;
+
+ // cancel
+ cancelText?: string;
+
// actions
canDelete?: boolean;
canConfirm?: boolean;
@@ -141,10 +147,17 @@ const props = withDefaults(defineProps(), {
maxWidth: null,
loading: false,
top: null,
+ keepOpen: false,
+
+ // submit
submitIcon: null,
submitText: () => useNuxtApp().$i18n.t("general.create"),
submitDisabled: false,
- keepOpen: false,
+
+ // cancel
+ cancelText: () => useNuxtApp().$i18n.t("general.cancel"),
+
+ // actions
canDelete: false,
canConfirm: false,
canSubmit: false,
diff --git a/frontend/lang/messages/en-US.json b/frontend/lang/messages/en-US.json
index 2c5cd54c0..f266b3a55 100644
--- a/frontend/lang/messages/en-US.json
+++ b/frontend/lang/messages/en-US.json
@@ -98,6 +98,7 @@
"dashboard": "Dashboard",
"delete": "Delete",
"disabled": "Disabled",
+ "done": "Done",
"download": "Download",
"duplicate": "Duplicate",
"edit": "Edit",