From f830ae5f915d9318edd59e48ceda226e2884f761 Mon Sep 17 00:00:00 2001 From: ogerly Date: Wed, 31 Mar 2021 12:28:15 +0200 Subject: [PATCH] fix-locale-list --- frontend/src/locales/de.json | 88 ++++++++++--------- frontend/src/locales/en.json | 53 +++++------ frontend/src/routes/routes.js | 4 +- frontend/src/store/store.js | 7 +- .../src/views/KontoOverview/GddAddWork2.vue | 14 +-- frontend/src/views/KontoOverview/GddSend.vue | 55 ++++++------ frontend/src/views/KontoOverview/GddTable.vue | 19 ++-- frontend/src/views/Layout/DashboardLayout.vue | 2 +- .../src/views/Pages/UserProfileActivity.vue | 8 +- 9 files changed, 128 insertions(+), 122 deletions(-) diff --git a/frontend/src/locales/de.json b/frontend/src/locales/de.json index d6337efae..aae7c7a08 100644 --- a/frontend/src/locales/de.json +++ b/frontend/src/locales/de.json @@ -1,13 +1,14 @@ { "message": "hallo gradido !!", "welcome":"Willkommen!", + "community": "Gemeinschaft", "logout":"Abmelden", "login":"Login", "signup": "Registrieren", "imprint":"Impressum", "privacy_policy":"Datenschutzerklärung", "back":"Zurück", - "sent":"Senden", + "send":"Senden", "transactions":"Transaktionen", "language":"Language", "languages":{ @@ -15,7 +16,11 @@ "en": "English" }, "form": { + "attention": "Achtung! Bitte überprüfe alle deine Eingaben sehr genau. Du bist alleine Verantwortlich für deine Entscheidungen. Versendete Gradidos können nicht wieder zurück geholt werden.", "cancel":"Abbrechen", + "close":"schließen", + "receiver":"Empfänger", + "sender":"Absender", "firstname":"Vorname", "lastname":"Nachname", "email":"eMail", @@ -23,13 +28,19 @@ "password":"Passwort", "password_repeat":"Passwort wiederholen", "amount":"Betrag", - "memo":"Info", + "memo":"Nachricht für den Empfänger", "message":"Nachricht", "date":"Datum", "from":"von", "to":"bis", "at":"am", - "send_now":"Jetzt versenden" + "time":"Zeit", + "send_now":"Jetzt versenden", + "scann_code":"QR Code Scanner - Scanne den QR Code deines Partners", + "max_gdd_info":"maximale anzahl GDD zum versenden erreicht!", + "send_check":"Bestätige deine Zahlung. Prüfe bitte nochmal alle Daten!", + "thx":"Danke!", + "send_success":"Deine Zahlung wurde erfolgreich versendet." }, "transaction":{ "show_part": "Die letzten {count} Transaktionen", @@ -60,46 +71,39 @@ "title": "Danke!", "subtitle": "Wir haben dir eine eMail gesendet." }, - "overview":{ - "account_overview":"Kontoübersicht", - "since_last_month": "seid letzten Monat", - "send_gradido":"Gradido versenden", - "add_work":"neuer Gemeinschaftsbeitrag" - }, - "navbar" : { - "my-profil":"Mein Profil", - "settings":"Einstellungen", - "activity":"Aktivität", - "support":"Support" - }, - "sidebar" : { - "community":"Gemeinschaft", - "members_area":"Mitgliederbereich", - "membership":"Mitgliedschaft", - "language":"Sprachen" - }, - "landing1" : { - "explore": "Erkunden Sie Gradido", - "text": "Gesundes Geld für eine gesunde Welt — Das Gradido-Modell kann weltweiten Wohlstand und Frieden schaffen", - "link": "Seiten erkunden" - }, - "404" : { - "ooops" : "Ooops!", - "text" : "Seite nicht gefunden. Aber keine Sorge, wir haben noch viele andere Seiten zum Erkunden", - "back" : "Zurück zur Übersicht!" - } - }, - "admin": { - "site": { - "overview": { - "created": "Schöpfen", - "transience" : "Transience", - "exchanged": "Exchanged", - "members" : "Members" - } + "overview":{ + "account_overview":"Kontoübersicht", + "since_last_month": "seid letzten Monat", + "send_gradido":"Gradido versenden", + "add_work":"neuer Gemeinschaftsbeitrag" + }, + "profil": { + "transactions":"transactions", + "activity": { + "chart":"Gemeinschaftsstunden Chart", + "new":"Neue Gemeinschaftsstunden eintragen", + "list":"Meine Gemeinschaftsstunden Liste" + } + }, + "navbar" : { + "my-profil":"Mein Profil", + "settings":"Einstellungen", + "activity":"Aktivität", + "support":"Support" + }, + "404" : { + "ooops" : "Ooops!", + "text" : "Seite nicht gefunden. Aber keine Sorge, wir haben noch viele andere Seiten zum Erkunden", + "back" : "Zurück zur Übersicht!" } }, - "nav": { - "features": "Neuigkeiten" + "communitys":{ + "form":{ + "hours":"Stunden", + "date_period":"Datum / Zeitraum", + "more_hours":"weitere Stunden", + "submit":"Einreichen", + "hours_report":"Stundenbericht" + } } } diff --git a/frontend/src/locales/en.json b/frontend/src/locales/en.json index 0961a1fc1..f2aa0d17f 100644 --- a/frontend/src/locales/en.json +++ b/frontend/src/locales/en.json @@ -1,13 +1,14 @@ { "message": "hello gradido !!", "welcome":"Welcome!", + "community": "Gemeinschaft", "logout":"Logout", "login":"Login", "signup": "Sign up", "imprint":"Legal notice", "privacy_policy":"Privacy policy", "back":"Back", - "sent":"Send", + "send":"Send", "transactions":"Transactions", "language":"Sprache", "languages":{ @@ -15,7 +16,11 @@ "en": "English" }, "form": { + "attention": "Achtung! Bitte überprüfe alle deine Eingaben sehr genau. Du bist alleine Verantwortlich für deine Entscheidungen. Versendete Gradidos können nicht wieder zurück geholt werden.", "cancel":"Cancel", + "close":"Close", + "receiver":"Receiver", + "sender":"Sender", "firstname":"Firstname", "lastname":"Lastname", "email":"Email", @@ -23,14 +28,19 @@ "password":"Password", "password_repeat":"Repeat password", "amount":"Amount", - "memo":"Memo", + "memo":"Message for the recipient", "message":"Message", "date":"Date", "from":"from", "to":"to", "at":"at", "time":"Time", - "send_now":"Send now" + "send_now":"Send now", + "scann_code":"QR Code Scanner - Scanne den QR Code deines Partners", + "max_gdd_info":"maximale anzahl GDD zum versenden erreicht!", + "send_check":"Bestätige deine Zahlung. Prüfe bitte nochmal alle Daten!", + "thx":"THX", + "send_success":"Deine Zahlung wurde erfolgreich versendet." }, "transaction":{ "show_part": "The last {count} transactions", @@ -67,40 +77,33 @@ "send_gradido":"Send Gradido", "add_work":"New Community Contribution" }, + "profil": { + "transactions":"transactions", + "activity": { + "chart":"Community Hours Chart", + "new":"Register new community hours", + "list":"My Community Hours List" + } + }, "navbar" : { "my-profil":"My profile", "settings":"Settings", "activity":"Activity", "support":"Support" }, - "sidebar" : { - "community":"Community", - "members_area":"Members area", - "membership":"Membership", - "language":"Languages" - }, - "landing1" : { - "explore":"Explore Gradido", - "text":"Healthy money for a healthy world — the Gradido model can create global prosperity and peace", - "link":"Explore pages" - }, "404" : { "ooops" : "Ooops!", "text" : "Page not found. Do not worry though, we have plenty of other pages to explore", "back" : "Back to dashboard!" } }, - "admin": { - "site": { - "overview": { - "creation": "Creation", - "transience" : "Transience", - "exchanged": "Exchanged", - "members" : "Members" - } + "communitys":{ + "form":{ + "hours":"hours", + "date_period":"Date / Period", + "more_hours":"more hours", + "submit":"submit", + "hours_report":"Hourly report" } - }, - "nav": { - "features": "Features" } } diff --git a/frontend/src/routes/routes.js b/frontend/src/routes/routes.js index 887c23655..19bd1b652 100755 --- a/frontend/src/routes/routes.js +++ b/frontend/src/routes/routes.js @@ -6,7 +6,7 @@ import AuthLayout from '@/views/Layout/AuthLayout.vue' const routes = [ { - path: '/', + path: '/login', redirect: 'login', component: AuthLayoutGDD, children: [ @@ -34,7 +34,7 @@ const routes = [ ], }, { - path: '/', + path: '/overview', redirect: 'overview', component: DashboardLayout, children: [ diff --git a/frontend/src/store/store.js b/frontend/src/store/store.js index 4c5b190fa..b1e8f182b 100644 --- a/frontend/src/store/store.js +++ b/frontend/src/store/store.js @@ -153,15 +153,14 @@ export const store = new Vuex.Store({ state.ajaxCreateData.amount, state.ajaxCreateData.memo, ) - console.log(result) + //console.log(result) if (result.success) { - console.log('send success') + //console.log('send success') } else { - console.log('send error') + //console.log('send error') } return result - }, ajaxListTransactions: async ({ commit, dispatch, state }) => { // console.log('action: ajaxListTransactions', state.session_id) diff --git a/frontend/src/views/KontoOverview/GddAddWork2.vue b/frontend/src/views/KontoOverview/GddAddWork2.vue index 6acbeec2d..0c3dad131 100644 --- a/frontend/src/views/KontoOverview/GddAddWork2.vue +++ b/frontend/src/views/KontoOverview/GddAddWork2.vue @@ -4,7 +4,7 @@ - + - + - +