IT4Change/gradido
3
0
Fork 0
mirror of https://github.com/IT4Change/gradido.git synced 2025-12-12 23:35:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix translations and formula display

Browse Source
This commit is contained in:
Moriz Wahl 2021-08-12 16:09:27 +02:00
parent 05d8ecf35d
commit 1b0cf3e5c7
4 changed files with 29 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
frontend/src/components/DecayInformation.vue
View File

@ -78,7 +78,7 @@ export default {
computed: {
decayStartBlockTextShort() {
return this.decay.decay_start_block
? ' - Startblock Decay am: ' + this.$d(this.$moment.unix(this.decay.decay_start_block))
? this.$t('decay.decayStart') + this.$d(this.$moment.unix(this.decay.decay_start_block))
: ''
},
duration() {

3
frontend/src/locales/de.json
View File

@ -24,6 +24,7 @@
"calculation_decay":"Berechnung der Vergänglichkeit",
"Starting_block_decay":"Startblock Vergänglichkeit",
"decay_introduced":"Die Vergänglichkeit wurde Eingeführt am ",
"decayStart": " - Startblock für Vergänglichkeit am: ",
"last_transaction":"Letzte Transaktion",
"past_time":"Vergangene Zeit",
"since_introduction":"seit Einführung der Vergänglichkeit",
@ -172,6 +173,8 @@
"gdt": {
"gdt-received":"Gradido Transform (GDT) erhalten",
"factor":"Faktor",
"raise": "Erhöhung",
"credit": "Gutschrift",
"conversion-gdt-euro":"Umrechnung Euro / Gradido Transform (GDT)",
"calculation":"Berechnung der Gradido Transform",
"conversion":"Umrechnung",

3
frontend/src/locales/en.json
View File

@ -24,6 +24,7 @@
"calculation_decay": "Calculation of Decay",
"Starting_block_decay": "Starting Block Decay",
"decay_introduced": "Decay was Introduced on",
"decayStart": " - Starting block for decay at: ",
"last_transaction": "Last transaction:",
"past_time": "Past time",
"since_introduction": "Since the introduction of Decay",
@ -173,6 +174,8 @@
"gdt": {
"gdt-received": "Gradido Transform (GDT) received",
"factor": "Factor",
"raise": "Increase",
"credit": "Credit",
"conversion-gdt-euro": "Conversion Euro / Gradido Transform (GDT)",
"calculation": "Calculation of Gradido Transform",
"conversion": "Conversion",

20
frontend/src/views/Pages/AccountOverview/GdtTransactionList.vue
View File

@ -32,7 +32,7 @@
<b-row v-if="gdt_entry_type_id === 7">
<div class="col-6 text-right">
<div>{{ $t('gdt.gdt-receive') }}</div>
<div>Gutschrift</div>
<div>{{ $t('gdt.credit') }}</div>
</div>
<div class="col-6">
<div>{{ comment }}</div>
@ -43,7 +43,7 @@
<b-row v-else-if="gdt_entry_type_id === 4">
<div class="col-6 text-right">
<div>{{ $t('gdt.your-share') }}</div>
<div>Gutschrift</div>
<div>{{ $t('gdt.credit') }}</div>
</div>
<div class="col-6">
<div>5%</div>
@ -54,7 +54,7 @@
<b-row v-else>
<div class="col-6 text-right">
<div>{{ $t('gdt.contribution') }}</div>
<div>Gutschrift</div>
<div>{{ $t('gdt.credit') }}</div>
</div>
<div class="col-6">
<div>{{ $n(amount, 'decimal') }} €</div>
@ -103,13 +103,14 @@
<!-- 7 nur GDT erhalten -->
<b-row class="gdt-list-clooaps-box-7" v-if="gdt_entry_type_id == 7">
<div class="col-6 text-right clooaps-col-left">
<div>{{ $t('gdt.factor') }}</div>
<div>{{ $t('gdt.raise') }}</div>
<div>{{ $t('gdt.conversion') }}</div>
</div>
<div class="col-6 clooaps-col-right">
<div>{{ factor }}</div>
<div>{{ factor * 100 }} %</div>
<div>
{{ $n(amount, 'decimal') }} € * {{ factor }} = {{ $n(gdt, 'decimal') }} GDT
{{ $n(amount, 'decimal') }} GDT * {{ factor * 100 }} % =
{{ $n(gdt, 'decimal') }} GDT
</div>
</div>
</b-row>
@ -123,12 +124,13 @@
<b-row class="gdt-list-clooaps-box--all" v-else>
<div class="col-6 text-right clooaps-col-left">
<div>{{ $t('gdt.factor') }}</div>
<div>{{ $t('gdt.formula') }}:</div>
<div>{{ $t('gdt.formula') }}</div>
</div>
<div class="col-6 clooaps-col-right">
<div>{{ factor }}</div>
<div>{{ factor }} GDT pro €</div>
<div>
{{ $n(amount, 'decimal') }} € * {{ factor }} = {{ $n(gdt, 'decimal') }} GDT
{{ $n(amount, 'decimal') }} € * {{ factor }} GDT / € =
{{ $n(gdt, 'decimal') }} GDT
</div>
</div>
</b-row>