IT4Change/gradido
3
0
Fork 0
mirror of https://github.com/IT4Change/gradido.git synced 2025-12-13 07:45:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
frontend/src/components/SidebarPlugin/SideBar.vue
View File

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

20
frontend/src/i18n.js
View File

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

4
frontend/src/views/Pages/AccountOverview/GddStatus.vue
View File

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

6
frontend/src/views/Pages/AccountOverview/GddTransactionList.vue
View File

@ -10,11 +10,11 @@
<div style="width: 8%"> <div style="width: 8%">
<b-icon :icon="getIcon(item)" :class="getClass(item)" /> <b-icon :icon="getIcon(item)" :class="getClass(item)" />
</div> </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> <span>{{ getOperator(item) }}</span>
{{ $n(item.balance) }} {{ $n(item.balance, 'decimal') }}
</div> </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 }} {{ item.name }}
<small>{{ item.name ? '' : $t('decay') }}</small> <small>{{ item.name ? '' : $t('decay') }}</small>
<div v-if="item.date" class="text-sm">{{ $d($moment(item.date), 'long') }}</div> <div v-if="item.date" class="text-sm">{{ $d($moment(item.date), 'long') }}</div>

2
frontend/src/views/Pages/UserProfile/UserCard.vue
View File

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