From f72315530e57c5b53f4e502227c426fd163a8b5e Mon Sep 17 00:00:00 2001 From: BacLuc Date: Fri, 27 Sep 2024 22:41:47 +0200 Subject: [PATCH 1/2] frontend: add components.story.storyDay.noStory to frontend In a6578ee, the story component in print was generalized to a summary component. By renaming the translation key in common, this also effected the frontend. Leave the other translation key in common, because the pdf module might also use it in the future. closes #6009 --- frontend/src/locales/de.json | 5 +++++ frontend/src/locales/en.json | 5 +++++ frontend/src/locales/fr.json | 5 +++++ frontend/src/locales/it.json | 5 +++++ 4 files changed, 20 insertions(+) diff --git a/frontend/src/locales/de.json b/frontend/src/locales/de.json index 9ff016c061..74dca89251 100644 --- a/frontend/src/locales/de.json +++ b/frontend/src/locales/de.json @@ -442,6 +442,11 @@ "title": "Wirklich löschen?" } }, + "story": { + "storyDay": { + "noStory": "Die Blöcke an diesem Tag enthalten keinen roten Faden." + } + }, "toast": { "toasts": { "multiLineToast": { diff --git a/frontend/src/locales/en.json b/frontend/src/locales/en.json index 6adcba4735..1b6fb76923 100644 --- a/frontend/src/locales/en.json +++ b/frontend/src/locales/en.json @@ -440,6 +440,11 @@ "title": "Really delete?" } }, + "story": { + "storyDay": { + "noStory": "The activities on this day do not contain any story content." + } + }, "toast": { "toasts": { "multiLineToast": { diff --git a/frontend/src/locales/fr.json b/frontend/src/locales/fr.json index afeb1d59d1..869bf1a13e 100644 --- a/frontend/src/locales/fr.json +++ b/frontend/src/locales/fr.json @@ -484,6 +484,11 @@ "409": "Oooops... Cette action a provoqué une erreur côté serveur.", "short": "erreur de serveur" }, + "story": { + "storyDay": { + "noStory": "Aucun file rouge trouvé ce jour-là..." + } + }, "toast": { "copied": "{source} copié" }, diff --git a/frontend/src/locales/it.json b/frontend/src/locales/it.json index e994a0db59..c21fc7e2f3 100644 --- a/frontend/src/locales/it.json +++ b/frontend/src/locales/it.json @@ -385,6 +385,11 @@ "title": "Davvero cancellare?" } }, + "story": { + "storyDay": { + "noStory": "Nessun contenuto di storia trovato in questo giorno..." + } + }, "toast": { "toasts": { "multiLineToast": { From 909f05ff57f11a74d2692be5579811cdbe5cc6d6 Mon Sep 17 00:00:00 2001 From: BacLuc Date: Fri, 27 Sep 2024 22:50:45 +0200 Subject: [PATCH 2/2] print: only wrap the article Else the quantity was wrapped when it had more than 1 digit. closes #6008 --- print/components/scheduleEntry/contentNode/Material.vue | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/print/components/scheduleEntry/contentNode/Material.vue b/print/components/scheduleEntry/contentNode/Material.vue index 2def6f1f6f..3668f2a51a 100644 --- a/print/components/scheduleEntry/contentNode/Material.vue +++ b/print/components/scheduleEntry/contentNode/Material.vue @@ -2,16 +2,12 @@ - + -
{{ item.quantity }} {{ item.unit || (item.quantity && '×') }} + {{ item.article }}