From 86232701728d258ac405644aeff5264b324ec9f6 Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Tue, 25 May 2021 18:41:01 +0200
Subject: [PATCH 1/2] add decimal number format, remove currency

---
 .../src/components/SidebarPlugin/SideBar.vue  |  3 ++-
 frontend/src/i18n.js                          | 20 +++++++++----------
 .../views/Pages/AccountOverview/GddStatus.vue |  4 ++--
 .../AccountOverview/GddTransactionList.vue    |  6 +++---
 .../src/views/Pages/UserProfile/UserCard.vue  |  2 +-
 5 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/frontend/src/components/SidebarPlugin/SideBar.vue b/frontend/src/components/SidebarPlugin/SideBar.vue
index f1e2a4455..ecf804c0f 100755
--- a/frontend/src/components/SidebarPlugin/SideBar.vue
+++ b/frontend/src/components/SidebarPlugin/SideBar.vue
@@ -1,3 +1,4 @@
+$n
 <template>
   <nav
     class="navbar navbar-vertical fixed-left navbar-expand-md navbar-light bg-transparent"
@@ -10,7 +11,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">
diff --git a/frontend/src/i18n.js b/frontend/src/i18n.js
index 20d578e75..ac1f8c002 100644
--- a/frontend/src/i18n.js
+++ b/frontend/src/i18n.js
@@ -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,
     },
   },
 }
diff --git a/frontend/src/views/Pages/AccountOverview/GddStatus.vue b/frontend/src/views/Pages/AccountOverview/GddStatus.vue
index 32fccce28..6bf03d69c 100644
--- a/frontend/src/views/Pages/AccountOverview/GddStatus.vue
+++ b/frontend/src/views/Pages/AccountOverview/GddStatus.vue
@@ -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>
diff --git a/frontend/src/views/Pages/AccountOverview/GddTransactionList.vue b/frontend/src/views/Pages/AccountOverview/GddTransactionList.vue
index 7fae1d935..a471a9572 100644
--- a/frontend/src/views/Pages/AccountOverview/GddTransactionList.vue
+++ b/frontend/src/views/Pages/AccountOverview/GddTransactionList.vue
@@ -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 class="text-sm">{{ $moment(item.date).format('DD.MM.YYYY - HH:mm:ss') }}</div>
diff --git a/frontend/src/views/Pages/UserProfile/UserCard.vue b/frontend/src/views/Pages/UserProfile/UserCard.vue
index b14670e21..ba9678d76 100755
--- a/frontend/src/views/Pages/UserProfile/UserCard.vue
+++ b/frontend/src/views/Pages/UserProfile/UserCard.vue
@@ -36,7 +36,7 @@
             </div>
             <div>
               <span class="heading">
-                {{ $n(balance) }}
+                {{ $n(balance, 'decimal') }}
               </span>
               <span class="description">GDD</span>
             </div>

From 567981fbd0e86533393ce5b423ba3f8699f1a653 Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Tue, 25 May 2021 18:44:41 +0200
Subject: [PATCH 2/2] remove editing fragment

---
 frontend/src/components/SidebarPlugin/SideBar.vue | 1 -
 1 file changed, 1 deletion(-)

diff --git a/frontend/src/components/SidebarPlugin/SideBar.vue b/frontend/src/components/SidebarPlugin/SideBar.vue
index ecf804c0f..60d835a1a 100755
--- a/frontend/src/components/SidebarPlugin/SideBar.vue
+++ b/frontend/src/components/SidebarPlugin/SideBar.vue
@@ -1,4 +1,3 @@
-$n
 <template>
   <nav
     class="navbar navbar-vertical fixed-left navbar-expand-md navbar-light bg-transparent"