diff --git a/frontend/src/components/Contributions/ContributionForm.vue b/frontend/src/components/Contributions/ContributionForm.vue index 079a0f02b..8a52146a1 100644 --- a/frontend/src/components/Contributions/ContributionForm.vue +++ b/frontend/src/components/Contributions/ContributionForm.vue @@ -139,14 +139,14 @@ export default { monthAndYear: this.$d(new Date(this.minimalDate), 'monthAndYear'), creation: this.$store.state.creation[1], } - return this.$t('contribution.formText.lastMonth', obj) + return this.$t('contribution.formText.openAmountForMonth', obj) }, thisMonthObject() { const obj = { monthAndYear: this.$d(new Date(), 'monthAndYear'), creation: this.$store.state.creation[2], } - return this.$t('contribution.formText.thisMonth', obj) + return this.$t('contribution.formText.openAmountForMonth', obj) }, isThisMonth() { return new Date(this.form.date).getMonth() === new Date().getMonth() diff --git a/frontend/src/components/Contributions/ContributionListItem.vue b/frontend/src/components/Contributions/ContributionListItem.vue index c5f9a7058..8675c0440 100644 --- a/frontend/src/components/Contributions/ContributionListItem.vue +++ b/frontend/src/components/Contributions/ContributionListItem.vue @@ -45,11 +45,11 @@ export default { }, firstName: { type: String, - require: false, + required: false, }, lastName: { type: String, - require: false, + required: false, }, createdAt: { type: String, diff --git a/frontend/src/locales/de.json b/frontend/src/locales/de.json index 8676eba9f..9625dc04b 100644 --- a/frontend/src/locales/de.json +++ b/frontend/src/locales/de.json @@ -35,11 +35,10 @@ "activity": "Tätigkeit", "formText": { "h3": "Dein Beitrag zum Gemeinwohl", - "lastMonth": "Für {monthAndYear} kannst du noch {creation} GDD einreichen.", "maxGDDforMonth": "Du kannst für den ausgewählten Monat nur noch maximal {amount} GDD einreichen.", + "openAmountForMonth": "Für {monthAndYear} kannst du noch {creation} GDD einreichen.", "text1": "Bring dich mit deinen Talenten in die Gemeinschaft ein! Dein freiwilliges Engagement honorieren wir mit 20 GDD pro Stunde bis maximal 1.000 GDD im Monat.", - "text2": "Beschreibe deine Gemeinwohl-Tätigkeit mit Angabe der Stunden und trage einen Betrag von 20 GDD pro Stunde ein! Nach Bestätigung durch einen Moderator wird der Betrag deinem Konto gutgeschrieben.", - "thisMonth": "Für {monthAndYear} kannst du noch {creation} GDD einreichen." + "text2": "Beschreibe deine Gemeinwohl-Tätigkeit mit Angabe der Stunden und trage einen Betrag von 20 GDD pro Stunde ein! Nach Bestätigung durch einen Moderator wird der Betrag deinem Konto gutgeschrieben." }, "noDateSelected": "Kein Datum ausgewählt", "submit": "Einreichen" diff --git a/frontend/src/locales/en.json b/frontend/src/locales/en.json index 4282c1086..7237ab74f 100644 --- a/frontend/src/locales/en.json +++ b/frontend/src/locales/en.json @@ -35,11 +35,10 @@ "activity": "Activity", "formText": { "h3": "Your contribution to the common good", - "lastMonth": "For {monthAndYear}, you can still submit {creation} GDD.", "maxGDDforMonth": "You can only submit a maximum of {amount} GDD for the selected month.", + "openAmountForMonth": "For {monthAndYear}, you can still submit {creation} GDD.", "text1": "Bring your talents to the community! Your voluntary commitment will be rewarded with 20 GDD per hour up to a maximum of 1,000 GDD per month.", - "text2": "Describe your community service activity with hours and enter an amount of 20 GDD per hour! After confirmation by a moderator, the amount will be credited to your account.", - "thisMonth": "For {monthAndYear}, you can still submit {creation} GDD." + "text2": "Describe your community service activity with hours and enter an amount of 20 GDD per hour! After confirmation by a moderator, the amount will be credited to your account." }, "noDateSelected": "No date selected", "submit": "Submit" diff --git a/frontend/src/routes/router.test.js b/frontend/src/routes/router.test.js index a1083a499..3e4fae2fd 100644 --- a/frontend/src/routes/router.test.js +++ b/frontend/src/routes/router.test.js @@ -75,6 +75,17 @@ describe('router', () => { }) }) + describe('community', () => { + it('requires community', () => { + expect(routes.find((r) => r.path === '/community').meta.requiresAuth).toBeTruthy() + }) + + it('loads the "Community" page', async () => { + const component = await routes.find((r) => r.path === '/community').component() + expect(component.default.name).toBe('Community') + }) + }) + describe('profile', () => { it('requires authorization', () => { expect(routes.find((r) => r.path === '/profile').meta.requiresAuth).toBeTruthy()