Merge branch 'fix-number-format' into test-transaction-list

This commit is contained in:
Moriz Wahl 2021-05-26 13:14:13 +02:00
commit 8457bcec78
5 changed files with 17 additions and 17 deletions

View File

@ -10,7 +10,7 @@
<img :src="logo" class="navbar-brand-img" alt="..." />
</div>
<b-row class="text-center">
<b-col>{{ pending ? '—' : $n(balance) }} GDD</b-col>
<b-col>{{ pending ? '—' : $n(balance, 'decimal') }} GDD</b-col>
</b-row>
<slot name="mobile-right">
<ul class="nav align-items-center d-md-none">

View File

@ -32,18 +32,18 @@ function loadLocaleMessages() {
}
const numberFormats = {
'en-US': {
currency: {
style: 'currency',
currency: 'GDD',
abbreviate: true,
en: {
decimal: {
style: 'decimal',
minimumFractionDigits: 2,
maximumFractionDigits: 2,
},
},
'de-DE': {
currency: {
style: 'currency',
currency: 'GDD',
abbreviate: true,
de: {
decimal: {
style: 'decimal',
minimumFractionDigits: 2,
maximumFractionDigits: 2,
},
},
}

View File

@ -3,12 +3,12 @@
<b-row>
<b-col>
<b-card style="background-color: #ebebeba3 !important">
{{ pending ? '—' : $n(balance) }} GDD
{{ pending ? '—' : $n(balance, 'decimal') }} GDD
</b-card>
</b-col>
<b-col>
<b-card class="lg-h2 text-right" style="background-color: #ebebeba3 !important">
{{ pending ? '—' : $n(GdtBalance) }} GDT
{{ pending ? '—' : $n(GdtBalance, 'decimal') }} GDT
</b-card>
</b-col>
</b-row>

View File

@ -10,11 +10,11 @@
<div style="width: 8%">
<b-icon :icon="getIcon(item)" :class="getClass(item)" />
</div>
<div class="font1_2em pr-2 text-right" style="width: 22%">
<div class="font1_2em pr-2 text-right" style="width: 32%">
<span>{{ getOperator(item) }}</span>
{{ $n(item.balance) }}
{{ $n(item.balance, 'decimal') }}
</div>
<div class="font1_2em text-left pl-2" style="width: 65%">
<div class="font1_2em text-left pl-2" style="width: 55%">
{{ item.name }}
<small>{{ item.name ? '' : $t('decay') }}</small>
<div v-if="item.date" class="text-sm">{{ $d($moment(item.date), 'long') }}</div>

View File

@ -36,7 +36,7 @@
</div>
<div>
<span class="heading">
{{ $n(balance) }}
{{ $n(balance, 'decimal') }}
</span>
<span class="description">GDD</span>
</div>