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 ########################################################## 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') }}
diff --git a/frontend/src/components/Inputs/InputTextarea.vue b/frontend/src/components/Inputs/InputTextarea.vue index e8dcf2840..3881c4b16 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 > {{ errors[0] }} diff --git a/frontend/src/locales/de.json b/frontend/src/locales/de.json index ce9f8b41d..406f2564a 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!", + "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 5841c759c..16d4a414b 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", + "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", 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) => {