From da57063b6898e4c10d335f2542a284cc4a09932f Mon Sep 17 00:00:00 2001 From: Sven Heidemann Date: Sun, 19 Nov 2023 00:31:25 +0100 Subject: [PATCH] Completed frontend #410 --- .../scheduled-events.component.ts | 18 +++------- web/src/assets/i18n/de.json | 20 +++++++++-- web/src/assets/i18n/en.json | 34 +++++++++++++++++-- 3 files changed, 54 insertions(+), 18 deletions(-) diff --git a/web/src/app/modules/view/server/scheduled-events/components/scheduled-events/scheduled-events.component.ts b/web/src/app/modules/view/server/scheduled-events/components/scheduled-events/scheduled-events.component.ts index 8c896e78..e37e66d6 100644 --- a/web/src/app/modules/view/server/scheduled-events/components/scheduled-events/scheduled-events.component.ts +++ b/web/src/app/modules/view/server/scheduled-events/components/scheduled-events/scheduled-events.component.ts @@ -251,7 +251,7 @@ export class ScheduledEventsComponent extends ComponentWithTable implements OnIn })).subscribe(result => { this.isEditingNew = false; this.spinner.hideSpinner(); - this.toastService.success(this.translate.instant("view.server.ScheduledEvents.message.scheduled_event_create"), this.translate.instant("view.server.ScheduledEvents.message.scheduled_event_create_d", { name: result.scheduledEvent.createScheduledEvent?.name })); + this.toastService.success(this.translate.instant("view.server.scheduled_events.message.scheduled_event_create"), this.translate.instant("view.server.scheduled_events.message.scheduled_event_create_d", { name: result.scheduledEvent.createScheduledEvent?.name })); this.loadNextPage(); }); return; @@ -275,14 +275,14 @@ export class ScheduledEventsComponent extends ComponentWithTable implements OnIn return throwError(err); })).subscribe(_ => { this.spinner.hideSpinner(); - this.toastService.success(this.translate.instant("view.server.ScheduledEvents.message.scheduled_event_update"), this.translate.instant("view.server.ScheduledEvents.message.scheduled_event_update_d", { name: newScheduledEvent.name })); + this.toastService.success(this.translate.instant("view.server.scheduled_events.message.scheduled_event_update"), this.translate.instant("view.server.scheduled_events.message.scheduled_event_update_d", { name: newScheduledEvent.name })); this.loadNextPage(); }); } public deleteScheduledEvent(ScheduledEvent: ScheduledEvent): void { this.confirmDialog.confirmDialog( - this.translate.instant("view.server.ScheduledEvents.message.scheduled_event_delete"), this.translate.instant("view.server.ScheduledEvents.message.scheduled_event_delete_q", { name: ScheduledEvent.name }), + this.translate.instant("view.server.scheduled_events.message.scheduled_event_delete"), this.translate.instant("view.server.scheduled_events.message.scheduled_event_delete_q", { name: ScheduledEvent.name }), () => { this.spinner.showSpinner(); this.data.mutation(Mutations.deleteScheduledEvent, { @@ -293,7 +293,7 @@ export class ScheduledEventsComponent extends ComponentWithTable implements OnIn return throwError(err); })).subscribe(l => { this.spinner.hideSpinner(); - this.toastService.success(this.translate.instant("view.server.ScheduledEvents.message.scheduled_event_deleted"), this.translate.instant("view.server.ScheduledEvents.message.scheduled_event_deleted_d", { name: ScheduledEvent.name })); + this.toastService.success(this.translate.instant("view.server.scheduled_events.message.scheduled_event_deleted"), this.translate.instant("view.server.scheduled_events.message.scheduled_event_deleted_d", { name: ScheduledEvent.name })); this.loadNextPage(); }); }); @@ -302,15 +302,5 @@ export class ScheduledEventsComponent extends ComponentWithTable implements OnIn public addScheduledEvent(): void { this.isEditingNew = true; this.editableScheduledEvent = JSON.parse(JSON.stringify(this.newScheduledEventTemplate)); - // const newScheduledEvent = JSON.parse(JSON.stringify(this.newScheduledEventTemplate)); - // - // this.scheduledEvents = [newScheduledEvent, ...this.scheduledEvents]; - // - // table.initRowEdit(newScheduledEvent); - // - // const index = this.scheduledEvents.findIndex(l => l.id == newScheduledEvent.id); - // this.onRowEditInit(table, newScheduledEvent, index); - // - // this.isEditingNew = true; } } diff --git a/web/src/assets/i18n/de.json b/web/src/assets/i18n/de.json index 7d70ae2d..00c2c1ed 100644 --- a/web/src/assets/i18n/de.json +++ b/web/src/assets/i18n/de.json @@ -555,11 +555,11 @@ "event_info": { "description": "Beschreibung", "description_input": "Erzähl den Leuten ein wenig mehr über dein Event. Markdown, neue Zeilen und Links werden unterstützt.", + "end_date_time": "Endzeitpunkt", "event_topic": "Thema", "event_topic_input": "Worum geht es bei deinem Event?", "header": "Worum geht es bei deinem Event?", "start_date_time": "Startzeitpunkt", - "end_date_time": "Endzeitpunkt", "tab_name": "Eventinformationen" }, "location": { @@ -567,8 +567,8 @@ "interval": "Interval", "intervals": { "daily": "Täglich", - "weekly": "Wöchentlich", "monthly": "Monatlich", + "weekly": "Wöchentlich", "yearly": "Jährlich" }, "somewhere_else": "Irgendwo anders", @@ -581,6 +581,22 @@ } }, "header": "Geplante Events", + "message": { + "scheduled_event_create": "Geplantes Event erstellt", + "scheduled_event_create_d": "Geplantes Event {{name}} erfolgreich erstellt", + "scheduled_event_create_failed": "Geplantes Event Erstellung fehlgeschlagen", + "scheduled_event_create_failed_d": "Die Erstellung der Geplantes Event ist fehlgeschlagen!", + "scheduled_event_delete": "Geplantes Event löschen", + "scheduled_event_delete_failed": "Geplantes Event Löschung fehlgeschlagen", + "scheduled_event_delete_failed_d": "Die Löschung der Geplantes Event {{name}} ist fehlgeschlagen!", + "scheduled_event_delete_q": "Sind Sie sich sicher, dass Sie das Geplantes Event {{name}} löschen möchten?", + "scheduled_event_deleted": "Geplantes Event gelöscht", + "scheduled_event_deleted_d": "Geplantes Event {{name}} erfolgreich gelöscht", + "scheduled_event_update": "Geplantes Event bearbeitet", + "scheduled_event_update_d": "Geplantes Event {{name}} erfolgreich bearbeitet", + "scheduled_event_update_failed": "Geplantes Event Bearbeitung fehlgeschlagen", + "scheduled_event_update_failed_d": "Die Bearbeitung der Geplantes Event ist fehlgeschlagen!" + }, "scheduled_events": "Geplante Events" }, "short_role_names": { diff --git a/web/src/assets/i18n/en.json b/web/src/assets/i18n/en.json index ebaa4b27..14453e12 100644 --- a/web/src/assets/i18n/en.json +++ b/web/src/assets/i18n/en.json @@ -146,6 +146,7 @@ "edit": "Edit", "email": "E-Mail", "emoji": "Emoji", + "end_time": "End time", "error": "Error", "export": "Export", "feature_flags": "Features", @@ -179,11 +180,13 @@ }, "id": "Id", "import": "Import", + "interval": "interval", "joined_at": "Joined at", "last_name": "Last name", "leaved_at": "Leaved at", "left_server": "Active", "level": "Level", + "location": "Location", "message_id": "Message Id", "min_xp": "Min. XP", "modified_at": "Modified at", @@ -203,10 +206,12 @@ "role": "Role", "rule_count": "Rules", "save": "Save", + "start_time": "Start time", "state": { "off": "Off", "on": "On" }, + "type": "Type", "user_warnings": "User warnings", "users": "User", "value": "Value", @@ -330,6 +335,7 @@ "config": "Configuration", "dashboard": "Dashboard", "members": "Members", + "scheduled_events": "Scheduled event", "server": { "achievements": "Achievements", "auto_roles": "Auto role", @@ -547,16 +553,24 @@ "add_header": "Add event", "edit_header": "Edit event", "event_info": { + "description": "Description", "description_input": "Tell people a little more about your event. Markdown, new lines and links are supported.", + "end_date_time": "End date", "event_topic": "Event topic", "event_topic_input": "What's your event?", "header": "What's your event about?", - "start_date": "Start date", - "start_time": "Start time", + "start_date_time": "Start date", "tab_name": "Event info" }, "location": { "header": "Where is your event?", + "interval": "Interval", + "intervals": { + "daily": "Daily", + "monthly": "Monthly", + "weekly": "Weekly", + "yearly": "Yearly" + }, "somewhere_else": "Somewhere else", "somewhere_else_input": "Enter a location", "stage": "Stage channel", @@ -567,6 +581,22 @@ } }, "header": "Scheduled events", + "message": { + "scheduled_event_create": "Scheduled event created", + "scheduled_event_create_d": "Scheduled event {{name}} successfully created", + "scheduled_event_create_failed": "Scheduled event creation failed", + "scheduled_event_create_failed_d": "Creation of scheduled event failed!", + "scheduled_event_delete": "Delete scheduled event", + "scheduled_event_delete_failed": "Scheduled event deletion failed", + "scheduled_event_delete_failed_d": "Deletion of scheduled event {{name}} failed!", + "scheduled_event_delete_q": "Are you sure you want to delete the {{name}} scheduled_event?", + "scheduled_event_deleted": "Scheduled event deleted", + "scheduled_event_deleted_d": "Scheduled event {{name}} successfully deleted\t", + "scheduled_event_update": "Scheduled event edited", + "scheduled_event_update_d": "Scheduled event {{name}} edited successfully", + "scheduled_event_update_failed": "Scheduled event editing failed", + "scheduled_event_update_failed_d": "Scheduled event editing failed!" + }, "scheduled_events": "Scheduled events" }, "short_role_names": {