diff --git a/frontend/src/components/SidebarPlugin/SideBar.vue b/frontend/src/components/SidebarPlugin/SideBar.vue index c2485a59e..ef9ae553a 100755 --- a/frontend/src/components/SidebarPlugin/SideBar.vue +++ b/frontend/src/components/SidebarPlugin/SideBar.vue @@ -56,10 +56,7 @@ {{ $t('site.navbar.support') }}
- - - {{ $t('logout') }} - + @@ -92,39 +89,46 @@
  • - Gradido.net + Gradido.net
  • - {{ $t('site.sidebar.members_area') }} + {{ $t('site.sidebar.members_area') }}
  • - {{ $t('site.sidebar.membership') }} + {{ $t('site.sidebar.membership') }}
    • -
    {{ $t('site.sidebar.language') }}
    +
    {{ $t('language') }}
    +
  • +
    + + {{ $t('logout') }} + +
    • + + diff --git a/frontend/src/locales/de.json b/frontend/src/locales/de.json index ba029fadc..4b3088866 100644 --- a/frontend/src/locales/de.json +++ b/frontend/src/locales/de.json @@ -8,7 +8,14 @@ "privacy_policy":"Datenschutzerklärung", "license":"Lizenz", "back":"zurück", + "transactions":"Transaktionen", + "language":"Sprachen", + "languages":{ + "de": "Deutsch", + "en": "English" + }, "form": { + "cancel":"abbrechen", "firstname":"Vorname", "lastname":"Nachname", "email":"eMail", @@ -22,12 +29,17 @@ "from":"von", "to":"bis", "at":"am", - "time":"Zeit" + "send_now":"jetzt versenden" + }, + "transaction":{ + "show_part": "Die letzten {count} Transaktionen", + "show_all":"Alle {count} Transaktionen ansehen", + "more": "mehr" }, "site": { "login": { "community":"Du bist die Gemeinschaft", - "remember":"merken", + "remember":"Passwort merken", "signin":"Anmelden", "forgot_pwd":"Passwort vergessen?", "new_wallet":"Neues Wallet erstellen" @@ -50,25 +62,9 @@ }, "overview":{ "account_overview":"Kontoübersicht", - "current_balance":"Aktueller Kontostand", - "gradido_received":"Erhaltene Gradido", "since_last_month": "seid letzten Monat", "send_gradido":"Gradido versenden", - "table" : { - "status":"Status", - "amount":"Betrag", - "name":"Name", - "date":"Datum", - "details":"Details", - "view":"Anzeigen", - "hide":"Ausblenden", - "decay":"Vergänglichkeit", - "sender":"Absender", - "hide_details":"Details ausblenden" - }, - "add_work":"neuer Gemeinschaftsbeitrag", - "xx":"xx", - "xxxx":"xxxx" + "add_work":"neuer Gemeinschaftsbeitrag" }, "navbar" : { "my-profil":"Mein Profil", diff --git a/frontend/src/locales/en.json b/frontend/src/locales/en.json index fe79fc4b9..e5757458c 100644 --- a/frontend/src/locales/en.json +++ b/frontend/src/locales/en.json @@ -8,21 +8,34 @@ "privacy_policy":"Privacy policy", "license":"License", "back":"back", + "transactions":"transactions", + "language":"Language", + "languages":{ + "de": "Deutsch", + "en": "English" + }, "form": { - "firstname":"firstname", - "lastname":"lastname", - "email":"email", + "cancel":"Cancel", + "firstname":"Firstname", + "lastname":"Lastname", + "email":"Email", "email_repeat":"repeat_email", - "password":"password", + "password":"Password", "password_repeat":"repeat password", - "amount":"amount", - "memo":"memo", - "message":"message", - "date":"date", + "amount":"Amount", + "memo":"Memo", + "message":"Message", + "date":"Date", "from":"from", "to":"to", "at":"at", - "time":"time" + "time":"Time", + "send_now":"send now" + }, + "transaction":{ + "show_part": "The last {count} transactions", + "show_all":"View all {count} transactions", + "more": "more" }, "site": { "login": { @@ -50,25 +63,9 @@ }, "overview":{ "account_overview":"Account overview", - "current_balance":"Current account balance", - "gradido_received":"Gradido received", "since_last_month": "since last month", "send_gradido":"Send Gradido", - "table" : { - "status":"Status", - "amount":"Amount", - "name":"Name", - "date":"Date", - "details":"Details", - "view":"View", - "hide":"hide", - "decay":"Decay", - "sender":"Sender", - "hide_details":"Hide details" - }, - "add_work":"New Community Contribution", - "xx":"xx", - "xxxx":"xxxx" + "add_work":"New Community Contribution" }, "navbar" : { "my-profil":"My Profil", @@ -79,8 +76,7 @@ "sidebar" : { "community":"Community", "members_area":"Members area", - "membership":"Membership", - "language":"Language" + "membership":"Membership" }, "landing1" : { "explore":"Explore Gradido", diff --git a/frontend/src/routes/routes.js b/frontend/src/routes/routes.js index e38726b7d..6cf3c8c0a 100755 --- a/frontend/src/routes/routes.js +++ b/frontend/src/routes/routes.js @@ -13,22 +13,18 @@ const routes = [ children: [ { path: '/login', - name: 'login', component: () => import('../views/Pages/Login.vue') }, { path: '/thx', - name: 'Thanks', component: () => import('../views/Pages/thx.vue') }, { path: '/register', - name: 'register', component: () => import('../views/Pages/Register.vue') }, { path: '/password', - name: 'password', component: () => import('../views/Pages/Password.vue') } ] @@ -40,7 +36,6 @@ const routes = [ children: [ { path: '/KontoOverview', - name: 'Kontoübersicht', component: () => import('../views/KontoOverview.vue'), meta: { requiresAuth: true @@ -48,17 +43,14 @@ const routes = [ }, { path: '/profile', - name: 'profile', component: () => import('../views/Pages/UserProfileCard.vue') }, { path: '/profileedit', - name: 'profileedit', component: () => import('../views/Pages/UserProfileEdit.vue') }, { path: '/activity', - name: 'activity', component: () => import('../views/Pages/UserProfileActivity.vue') } ] diff --git a/frontend/src/views/KontoOverview.vue b/frontend/src/views/KontoOverview.vue index 39dee08b9..23af21cee 100644 --- a/frontend/src/views/KontoOverview.vue +++ b/frontend/src/views/KontoOverview.vue @@ -1,49 +1,36 @@ - - \ No newline at end of file diff --git a/frontend/src/views/Layout/AuthLayout_gdd.vue b/frontend/src/views/Layout/AuthLayout_gdd.vue index b60d11af1..51b9fc9b7 100644 --- a/frontend/src/views/Layout/AuthLayout_gdd.vue +++ b/frontend/src/views/Layout/AuthLayout_gdd.vue @@ -34,9 +34,11 @@ - - English - Deutsch +
    +
    + + {{ $t('languages.en') }} + {{ $t('languages.de') }} diff --git a/frontend/src/views/Layout/ContentFooter.vue b/frontend/src/views/Layout/ContentFooter.vue index b354e12ef..5a73f4cb4 100755 --- a/frontend/src/views/Layout/ContentFooter.vue +++ b/frontend/src/views/Layout/ContentFooter.vue @@ -23,9 +23,11 @@     +
    +
    - English - Deutsch + {{ $t('languages.en') }} + {{ $t('languages.de') }} diff --git a/frontend/src/views/Pages/Login.vue b/frontend/src/views/Pages/Login.vue index b5605cd59..f882fbce1 100755 --- a/frontend/src/views/Pages/Login.vue +++ b/frontend/src/views/Pages/Login.vue @@ -47,7 +47,7 @@ :rules="{required: true, min: 6}" prepend-icon="ni ni-lock-circle-open" type="password" - placeholder="Password" + :placeholder="$t('form.password')" v-model="model.password">