Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

devel > staging #6013

Merged
merged 4 commits into from
Sep 27, 2024
Merged

devel > staging #6013

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f723155
frontend: add components.story.storyDay.noStory to frontend
BacLuc Sep 27, 2024
909f05f
print: only wrap the article
BacLuc Sep 27, 2024
c1c68ef
Merge pull request #6011 from BacLuc/fix-translation-key
pmattmann Sep 27, 2024
08a4e3c
Merge pull request #6012 from BacLuc/fix-wrap-print
BacLuc Sep 27, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions frontend/src/locales/de.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -442,6 +442,11 @@
"title": "Wirklich löschen?"
}
},
"story": {
"storyDay": {
"noStory": "Die Blöcke an diesem Tag enthalten keinen roten Faden."
}
},
"toast": {
"toasts": {
"multiLineToast": {
Expand Down
5 changes: 5 additions & 0 deletions frontend/src/locales/en.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -440,6 +440,11 @@
"title": "Really delete?"
}
},
"story": {
"storyDay": {
"noStory": "The activities on this day do not contain any story content."
}
},
"toast": {
"toasts": {
"multiLineToast": {
Expand Down
5 changes: 5 additions & 0 deletions frontend/src/locales/fr.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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é"
},
Expand Down
5 changes: 5 additions & 0 deletions frontend/src/locales/it.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -385,6 +385,11 @@
"title": "Davvero cancellare?"
}
},
"story": {
"storyDay": {
"noStory": "Nessun contenuto di storia trovato in questo giorno..."
}
},
"toast": {
"toasts": {
"multiLineToast": {
Expand Down
8 changes: 2 additions & 6 deletions print/components/scheduleEntry/contentNode/Material.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,12 @@
<content-node-content :content-node="contentNode" :icon-path="mdiPackageVariant">
<generic-error-message v-if="error" :error="error" />
<table v-else>
<tr
v-for="item in items"
:key="item.id"
class="item tw-tabular-nums tw-break-anywhere"
>
<tr v-for="item in items" :key="item.id" class="item tw-tabular-nums">
<td align="right">
{{ item.quantity }}
</td>
<td>{{ item.unit || (item.quantity && '×') }}</td>
<td width="65%">
<td width="65%" class="tw-break-anywhere">
{{ item.article }}
</td>
<td width="30%">
Expand Down
Loading