many translations. translation structure

This commit is contained in:
ogerly 2021-03-04 18:22:39 +01:00
parent c3d2be342a
commit bf68547976
12 changed files with 87 additions and 194 deletions

View File

@ -56,10 +56,7 @@
<span>{{ $t('site.navbar.support') }}</span>
</router-link>
<div class="dropdown-divider"></div>
<a href="#!" class="dropdown-item" @click="logout">
<i class="ni ni-user-run"></i>
<span>{{ $t('logout') }}</span>
</a>
</base-dropdown>
</ul>
</slot>
@ -92,39 +89,46 @@
<li class="nav-item">
<a class="nav-link"
href="https://gradido.net/de/">
<i class="ni ni-spaceship"></i> Gradido.net
Gradido.net
</a>
</li>
<li class="nav-item">
<a class="nav-link"
href="https://elopage.com/s/gradido/sign_in">
<i class="ni ni-palette"></i> {{ $t('site.sidebar.members_area') }}
{{ $t('site.sidebar.members_area') }}
</a>
</li>
<li class="nav-item">
<a class="nav-link"
href="https://gradido.net/de/memberships/">
<i class="ni ni-ui-04"></i> {{ $t('site.sidebar.membership') }}
{{ $t('site.sidebar.membership') }}
</a>
</li>
</ul>
<!--Divider-->
<hr class="my-3">
<!--Heading-->
<h6 class="navbar-heading text-muted">{{ $t('site.sidebar.language') }}</h6>
<h6 class="navbar-heading text-muted">{{ $t('language') }}</h6>
<!--Navigation-->
<ul class="navbar-nav mb-md-3">
<li class="nav-item">
<div class="nav-link" @click.prevent="setLocale('en')">
<i class="ni ni-ui-04"></i> English</div>
{{ $t('languages.en') }}</div>
</li>
<li class="nav-item">
<div class="nav-link" @click.prevent="setLocale('de')">
<i class="ni ni-ui-04"></i> Deutsch</div>
<li class="nav-item">
<a class="nav-link" href="#!" @click.prevent="setLocale('de')">
{{ $t('languages.de') }}
</a>
</li>
</ul>
<li class="nav-item">
<hr class="my-3">
<a class="nav-link" href="#!" @click="logout">
{{ $t('logout') }}
</a>
</li>
</ul>
</div>
</div>
</nav>

View File

@ -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 <strong>{count}</strong> Transaktionen",
"show_all":"Alle <strong>{count}</strong> 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",

View File

@ -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 <strong>{count}</strong> transactions",
"show_all":"View all <strong>{count}</strong> 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",

View File

@ -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')
}
]

View File

@ -1,49 +1,36 @@
<template>
<div>
<base-header class="pb-6 pb-8 pt-5 pt-md-8 bg-gradient-success">
<!-- Card stats GDD User Status -->
<gdd-status />
<gdd-status />
<br>
<!-- Card sent GDD-->
<gdd-sent />
<hr>
<!-- Card table -->
<div>
<gdd-table />
</div>
<!-- Card table
<gdd-table />
<!--
<hr>
<div>
<gdd-add-work />
<gdd-add-work />
</div>
<br>
-->
<!-- Card table
<!--
<div>
<gdd-work-table />
<gdd-work-table />
</div>
-->
</base-header>
</base-header>
<hr>
</div>
</template>
<script>
import GddStatus from './KontoOverview/GddStatus.vue';
import GddSent from './KontoOverview/GddSent.vue';
import GddTable from './KontoOverview/GddTable.vue';
//import GddAddWork from './KontoOverview/GddAddWork.vue';
// import GddWorkTable from './KontoOverview/GddWorkTable.vue';
// import GddAddWork from './KontoOverview/GddAddWork.vue';
// import GddWorkTable from './KontoOverview/GddWorkTable.vue';
export default {
name: "Overview",
components: {
GddStatus,
GddSent,

View File

@ -2,8 +2,7 @@
<div>
<b-row>
<b-col xl="12" md="12">
<base-button icon type="primary" size="lg" v-b-toggle.collapse-1>
<span class="btn-inner--icon"><i class="ni ni-curved-next"></i></span>
<base-button block icon type="primary" size="lg" v-b-toggle.collapse-1>
<span class="btn-inner--text">{{ $t('site.overview.send_gradido') }} </span>
</base-button>
<b-collapse id="collapse-1" class="mt-2">
@ -92,8 +91,8 @@
</div>
<br>
<b-button type="submit" variant="primary">jetzt versenden</b-button>
<b-button type="reset" variant="danger">Cancel</b-button>
<b-button type="submit" variant="primary">{{$t('form.send_now')}}</b-button>
<b-button type="reset" variant="danger">{{$t('form.cancel')}}</b-button>
<br>
</b-form>
</validation-observer>

View File

@ -2,25 +2,17 @@
<div>
<b-row>
<b-col xl="6" md="6">
<stats-card :title="$t('site.overview.current_balance')"
type="gradient-red"
<stats-card type="gradient-red"
sub-title="balance_gdd"
class="mb-4">
{{ $n($store.state.user.balance) }} GDD
<template slot="footer">
<span class="text-success mr-2">Wird immer angezeigt</span>
</template>
{{ $n($store.state.user.balance) }} GDD
</stats-card>
</b-col>
<b-col xl="6" md="6">
<stats-card :title="$t('site.overview.gradido_received')"
type="gradient-orange"
<stats-card type="gradient-orange"
sub-title="balance_gdt"
class="mb-4">
{{ $n($store.state.user.balance_gdt) }} GDT
<template slot="footer">
<span class="text-nowrap">Wird nur angezeigt wenn user GDT besitzt.</span>
</template>
{{ $n($store.state.user.balance_gdt) }} GDT
</stats-card>
</b-col>
</b-row>

View File

@ -20,7 +20,7 @@
<b-list-group-item> <b-badge class="mr-4" variant="primary" pill>gdd</b-badge>{{item.balance}}</b-list-group-item>
<b-list-group-item> <b-badge class="mr-4" variant="primary" pill>memo</b-badge>{{item.memo}}</b-list-group-item>
</b-list-group>
<b-button v-b-toggle="'collapse-1-inner'+ item.transaction_id" size="sm">\i/ more</b-button>
<b-button v-b-toggle="'collapse-1-inner'+ item.transaction_id" size="sm">{{$t('transaction.more')}}</b-button>
<b-collapse :id="'collapse-1-inner'+ item.transaction_id" class="mt-2">
<b-card>{{item}}</b-card>
</b-collapse>
@ -28,10 +28,8 @@
</b-collapse>
</b-list-group-item>
<b-list-group-item>
<b-alert v-if="count < 5" show variant="secondary">
Die letzten <strong>{{count}}</strong> Transaktionen
</b-alert>
<router-link to="/activity" > mehr (+ {{count}})</router-link>
<b-alert v-if="count < 5" show variant="secondary" v-html="$t('transaction.show_part', {'count':count} )"></b-alert>
<router-link else to="/activity" v-html="$t('transaction.show_all', {'count':count})"> </router-link>
</b-list-group-item>

View File

@ -1,75 +0,0 @@
<template>
<div>
<b-table striped hover :items="items" :fields="fields" :tbody-tr-class="rowClass">
<template #cell(status)="row">
<img v-if="row.item.status === 'sent' " src="img/icons/gradido/minus.png" width="50" />
<img v-else src="img/icons/gradido/plus-low.png" width="50" />
</template>
<template #cell(details)="row">
<b-button size="sm" @click="row.toggleDetails" class="mr-2">
{{ row.detailsShowing ? $t('site.overview.table.hide') : $t('site.overview.table.view') }}
</b-button>
</template>
<template #row-details="row">
<b-card>
<b-row class="mb-2">
<b-col sm="3" class="text-sm-right"><b>{{ $t('site.overview.table.amount') }}:</b></b-col>
<b-col>{{ row.item.amount }} GDD</b-col>
</b-row>
<b-row class="mb-2">
<b-col sm="3" class="text-sm-right"><b>{{ $t('site.overview.table.decay') }}: </b></b-col>
<b-col>{{ row.item.isActive }}0.0032 GDD</b-col>
</b-row>
<b-row class="mb-2">
<b-col sm="3" class="text-sm-right"><b>{{ $t('site.overview.table.sender') }}: </b></b-col>
<b-col>{{ row.item.name }}</b-col>
<b-col>{{ row.item.date }}</b-col>
</b-row>
<b-button size="sm" @click="row.toggleDetails">{{ $t('site.overview.table.hide_details') }}</b-button>
</b-card>
</template>
</b-table>
</div>
</template>
<script>
export default {
name: 'GddTable',
data(){
return {
form: [],
fields: [ 'status', 'betrag', 'name', 'datum', 'details'],
items: [
{ betrag: 1000, name: 'Dickerson', datum: '12.12.20', datel: '12.12.2020 14:04', status: 'received' },
{ betrag: 302, name: 'Larsen', datum: '22.06.20', datel: '22.06.2020 22:23', status: 'sent' },
{ betrag: 89, name: 'Geneva', datum: '15.04.20', datel: '15.04.2020 12:55', status: 'sent' },
{ betrag: 1000, name: 'Community', datum: '10.03.20', datel: '10.03.2020 18:20', status: 'received'}
]
};
},
methods: {
rowClass(item, type) {
if (!item || type !== 'row') return
if (item.status === 'received') return 'table-success'
if (item.status === 'sent') return 'table-warning'
if (item.status === 'earned') return 'table-primary'
},
},
watch: {
}
};
</script>
<style>
.el-table .cell{
padding-left: 0px;
padding-right: 0px;
}
</style>

View File

@ -34,9 +34,11 @@
</b-nav>
</b-col>
</b-row>
<b-row >
<b-col class="nav-link text-center" @click.prevent="setLocale('en')">English</b-col>
<b-col class="nav-link text-center" @click.prevent="setLocale('de')">Deutsch</b-col>
<br>
<br>
<b-row >
<b-col class="nav-link text-center" @click.prevent="setLocale('en')">{{ $t('languages.en') }}</b-col>
<b-col class="nav-link text-center" @click.prevent="setLocale('de')">{{ $t('languages.de') }}</b-col>
</b-row>
</b-container>
</footer>

View File

@ -23,9 +23,11 @@
</b-nav>
</b-col>
</b-row>
<br>
<br>
<b-row >
<b-col class="nav-link text-center" @click.prevent="setLocale('en')">English</b-col>
<b-col class="nav-link text-center" @click.prevent="setLocale('de')">Deutsch</b-col>
<b-col class="nav-link text-center" @click.prevent="setLocale('en')">{{ $t('languages.en') }}</b-col>
<b-col class="nav-link text-center" @click.prevent="setLocale('de')">{{ $t('languages.de') }}</b-col>
</b-row>
</footer>
</template>

View File

@ -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">
</base-input>