diff --git a/frontend/src/components/GddSend/TransactionForm.vue b/frontend/src/components/GddSend/TransactionForm.vue index 5efa6012b..c015990e8 100644 --- a/frontend/src/components/GddSend/TransactionForm.vue +++ b/frontend/src/components/GddSend/TransactionForm.vue @@ -2,10 +2,10 @@
- + - + @@ -39,14 +39,13 @@ - -
-

{{ $t('gdd_per_link.header') }}

-
- {{ $t('gdd_per_link.choose-amount') }} -
-
+
+

{{ $t('gdd_per_link.header') }}

+
+ {{ $t('gdd_per_link.choose-amount') }} +
+
@@ -106,7 +105,10 @@ - {{ $t('form.check_now') }} + {{ $t('form.check_now') }} + + {{ $t('form.generate_now') }} + diff --git a/frontend/src/locales/de.json b/frontend/src/locales/de.json index a51b48e37..ff45ac1b8 100644 --- a/frontend/src/locales/de.json +++ b/frontend/src/locales/de.json @@ -51,7 +51,7 @@ "deleted": "Der Beitrag wurde gelöscht! Wird aber sichtbar bleiben.", "formText": { "bringYourTalentsTo": "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.", - "describeYourCommunity": "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.", + "describeYourCommunity": "Beschreibe deine Gemeinwohl-Tätigkeit und gib die Anzahl der Stunden an! Der Betrag von 20 GDD pro Stunde wird automatisch berechnet. Nach Bestätigung durch einen Moderator wird der Betrag deinem Konto gutgeschrieben.", "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.", "yourContribution": "Dein Beitrag zum Gemeinwohl" @@ -251,7 +251,7 @@ }, "openHours": "Offene Stunden", "pageTitle": { - "community": "Meine Gemeinschaft", + "community": "Gradido schöpfen", "gdt": "Deine GDT Transaktionen", "information": "{community}", "overview": "Willkommen {name}", diff --git a/frontend/src/locales/en.json b/frontend/src/locales/en.json index ce65ac9af..5fa70d131 100644 --- a/frontend/src/locales/en.json +++ b/frontend/src/locales/en.json @@ -50,11 +50,11 @@ "delete": "Delete Contribution! Are you sure?", "deleted": "The contribution has been deleted! But it will remain visible.", "formText": { - "bringYourTalentsTo": "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.", - "describeYourCommunity": "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.", + "bringYourTalentsTo": "Bring your talents to the community! We reward your voluntary commitment with 20 GDD per hour up to a maximum of 1,000 GDD per month.", + "describeYourCommunity": "Describe your community service activity and specify the number of hours! The amount of 20 GDD per hour will be calculated automatically. After confirmation by a moderator, the amount will be credited to your account.", "maxGDDforMonth": "You can only submit a maximum of {amount} GDD for the selected month.", "openAmountForMonth": "For {monthAndYear}, you can still submit {creation} GDD.", - "yourContribution": "Your contribution to the common good" + "yourContribution": "Your Contributions to the Common Good" }, "lastContribution": "Last Contributions", "noDateSelected": "Choose any date in the month", @@ -251,7 +251,7 @@ }, "openHours": "Open Hours", "pageTitle": { - "community": "My community", + "community": "Create Gradido", "gdt": "Your GDT transactions", "information": "{community}", "overview": "Welcome {name}", diff --git a/frontend/src/pages/Community.vue b/frontend/src/pages/Community.vue index 5b771eac9..d5475634e 100644 --- a/frontend/src/pages/Community.vue +++ b/frontend/src/pages/Community.vue @@ -296,8 +296,8 @@ export default { }, created() { this.updateTransactions(0) - this.tabIndex = 1 - this.$router.push({ path: '/community#my' }) + this.tabIndex = 0 + this.$router.push({ path: '/community#edit' }) }, }