From cda222a648b118e62ae318df1c17fc7fd54d2a1b Mon Sep 17 00:00:00 2001 From: ogerly Date: Thu, 19 Jan 2023 13:39:08 +0100 Subject: [PATCH 1/6] change contribution memo add word-break --- .../src/components/Contributions/ContributionListItem.vue | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/frontend/src/components/Contributions/ContributionListItem.vue b/frontend/src/components/Contributions/ContributionListItem.vue index 4717f29e5..faec028f9 100644 --- a/frontend/src/components/Contributions/ContributionListItem.vue +++ b/frontend/src/components/Contributions/ContributionListItem.vue @@ -16,12 +16,15 @@ -
{{ firstName }} {{ lastName }}
+
+ {{ firstName }} {{ lastName }} + +
{{ $d(new Date(contributionDate), 'monthAndYear') }}
{{ $t('contributionText') }}
-
{{ memo }}
+
{{ memo }}
{{ $t('contribution.alert.answerQuestion') }}
From e519f048fe59c2eded6c25aed14f31c0f9ef0ef8 Mon Sep 17 00:00:00 2001 From: ogerly Date: Thu, 19 Jan 2023 14:27:38 +0100 Subject: [PATCH 2/6] add no-resize props on InpuArea.vue --- frontend/src/components/Inputs/InputTextarea.vue | 1 + 1 file changed, 1 insertion(+) diff --git a/frontend/src/components/Inputs/InputTextarea.vue b/frontend/src/components/Inputs/InputTextarea.vue index e8dcf2840..4096a1b09 100644 --- a/frontend/src/components/Inputs/InputTextarea.vue +++ b/frontend/src/components/Inputs/InputTextarea.vue @@ -18,6 +18,7 @@ rows="4" max-rows="4" :disabled="disabled" + no-resize="true" > {{ errors[0] }} From 89d5d3b3cbbc70d026264097be6f5e5c7855d20c Mon Sep 17 00:00:00 2001 From: Ulf Gebhardt Date: Thu, 19 Jan 2023 15:16:22 +0100 Subject: [PATCH 3/6] fixed error --- frontend/src/components/Inputs/InputTextarea.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/src/components/Inputs/InputTextarea.vue b/frontend/src/components/Inputs/InputTextarea.vue index 4096a1b09..3881c4b16 100644 --- a/frontend/src/components/Inputs/InputTextarea.vue +++ b/frontend/src/components/Inputs/InputTextarea.vue @@ -18,7 +18,7 @@ rows="4" max-rows="4" :disabled="disabled" - no-resize="true" + no-resize > {{ errors[0] }} From 7349a9bdd1aaed82f499e52098b278d126ab1ecd Mon Sep 17 00:00:00 2001 From: ogerly Date: Thu, 19 Jan 2023 15:24:54 +0100 Subject: [PATCH 4/6] add localation in toast --- frontend/src/locales/de.json | 3 ++- frontend/src/locales/en.json | 3 ++- frontend/src/pages/Community.vue | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/frontend/src/locales/de.json b/frontend/src/locales/de.json index ce9f8b41d..d4f1544b9 100644 --- a/frontend/src/locales/de.json +++ b/frontend/src/locales/de.json @@ -37,7 +37,8 @@ "contribution": { "activity": "Tätigkeit", "alert": { - "answerQuestion": "Bitte beantworte die Rückfrage!", + "answerQuestionToast": "Du hast eine Rückfrage auf einen Beitrag. Bitte antworte auf diese.", + "answerQuestion": "Bitte beantworte diese Rückfrage.", "communityNoteList": "Hier findest du alle eingereichten und bestätigten Beiträge von allen Mitgliedern aus dieser Gemeinschaft.", "confirm": "bestätigt", "deleted": "gelöscht", diff --git a/frontend/src/locales/en.json b/frontend/src/locales/en.json index 5841c759c..d45502df1 100644 --- a/frontend/src/locales/en.json +++ b/frontend/src/locales/en.json @@ -37,7 +37,8 @@ "contribution": { "activity": "Activity", "alert": { - "answerQuestion": "Please answer the question", + "answerQuestionToast": "You have a question about a post. Please reply to it.", + "answerQuestion": "Please answer the question.", "communityNoteList": "Here you will find all submitted and confirmed contributions from all members of this community.", "confirm": "confirmed", "deleted": "deleted", diff --git a/frontend/src/pages/Community.vue b/frontend/src/pages/Community.vue index 13aad1a72..5e4186c21 100644 --- a/frontend/src/pages/Community.vue +++ b/frontend/src/pages/Community.vue @@ -282,7 +282,7 @@ export default { if (this.$route.hash !== '#my') { this.$router.push({ path: '/community#my' }) } - this.toastInfo('Du hast eine Rückfrage auf eine Contribution. Bitte beantworte diese!') + this.toastInfo(this.$t('contribution.alert.answerQuestionToast')) } }) .catch((err) => { From aa5a6e071130cc4363970f4db558247478c17c42 Mon Sep 17 00:00:00 2001 From: ogerly Date: Thu, 19 Jan 2023 15:37:41 +0100 Subject: [PATCH 5/6] fix locales --- frontend/src/locales/de.json | 2 +- frontend/src/locales/en.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/frontend/src/locales/de.json b/frontend/src/locales/de.json index d4f1544b9..406f2564a 100644 --- a/frontend/src/locales/de.json +++ b/frontend/src/locales/de.json @@ -37,8 +37,8 @@ "contribution": { "activity": "Tätigkeit", "alert": { - "answerQuestionToast": "Du hast eine Rückfrage auf einen Beitrag. Bitte antworte auf diese.", "answerQuestion": "Bitte beantworte diese Rückfrage.", + "answerQuestionToast": "Du hast eine Rückfrage auf einen Beitrag. Bitte antworte auf diese.", "communityNoteList": "Hier findest du alle eingereichten und bestätigten Beiträge von allen Mitgliedern aus dieser Gemeinschaft.", "confirm": "bestätigt", "deleted": "gelöscht", diff --git a/frontend/src/locales/en.json b/frontend/src/locales/en.json index d45502df1..16d4a414b 100644 --- a/frontend/src/locales/en.json +++ b/frontend/src/locales/en.json @@ -37,8 +37,8 @@ "contribution": { "activity": "Activity", "alert": { - "answerQuestionToast": "You have a question about a post. Please reply to it.", "answerQuestion": "Please answer the question.", + "answerQuestionToast": "You have a question about a post. Please reply to it.", "communityNoteList": "Here you will find all submitted and confirmed contributions from all members of this community.", "confirm": "confirmed", "deleted": "deleted", From 0b7fdac38a8c96b06d9dabe04502f0ce8e79017a Mon Sep 17 00:00:00 2001 From: Ulf Gebhardt Date: Thu, 19 Jan 2023 18:24:00 +0100 Subject: [PATCH 6/6] removed comment --- .github/workflows/test.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index dfac48371..412154b04 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -35,7 +35,6 @@ jobs: build_test_admin: name: Docker Build Test - Admin Interface runs-on: ubuntu-latest - #needs: [nothing] steps: ########################################################################## # CHECKOUT CODE ##########################################################