From 15981da64b6bb39f83667bdc75f158aaac64af1b Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Tue, 15 Mar 2022 02:53:59 +0100
Subject: [PATCH] no more lint warnings

---
 .../DecayInformation-Decay.vue                |  2 +-
 .../DecayInformation-DecayStartblock.vue      |  3 +-
 .../DecayInformation-Long.vue                 |  1 -
 frontend/src/components/GddSend/QrCode.vue    |  2 +
 .../GddSend/TransactionConfirmationLink.vue   |  6 ++-
 .../GddSend/TransactionConfirmationSend.vue   |  4 +-
 .../components/GddSend/TransactionForm.vue    |  2 +-
 .../GddSend/TransactionResultSendError.vue    |  2 +-
 .../components/GddTransactionListFooter.vue   |  4 +-
 frontend/src/components/Menu/Navbar.spec.js   | 26 ++++-----
 frontend/src/components/Menu/Navbar.vue       | 24 +++++----
 frontend/src/components/Menu/Sidebar.spec.js  | 26 ++++-----
 frontend/src/components/Menu/Sidebar.vue      | 18 ++++---
 frontend/src/components/PaginationButtons.vue |  2 +-
 frontend/src/components/Status.vue            |  2 +-
 frontend/src/components/Transaction.vue       |  2 +-
 .../components/TransactionRows/DateRow.vue    |  1 -
 frontend/src/components/UserCard.vue          |  6 +--
 frontend/src/layouts/ContentFooter.spec.js    |  2 +-
 frontend/src/layouts/ContentFooter.vue        | 20 +++----
 frontend/src/locales/de.json                  | 51 ++++++++++++------
 frontend/src/locales/en.json                  | 53 ++++++++++++-------
 frontend/src/pages/Login.vue                  |  2 +-
 frontend/src/pages/Register.vue               |  7 ++-
 frontend/src/validation-rules.js              |  4 ++
 25 files changed, 158 insertions(+), 114 deletions(-)

diff --git a/frontend/src/components/DecayInformations/DecayInformation-Decay.vue b/frontend/src/components/DecayInformations/DecayInformation-Decay.vue
index 19aac9e98..7377b6fa8 100644
--- a/frontend/src/components/DecayInformations/DecayInformation-Decay.vue
+++ b/frontend/src/components/DecayInformations/DecayInformation-Decay.vue
@@ -14,7 +14,7 @@
       <b-col cols="6">
         <div>
           {{ (Number(balance) - Number(decay.decay)) | GDD }}
-          {{ decay.decay | GDD }} =
+          {{ decay.decay | GDD }} {{ $t('math.equal') }}
           <b>{{ balance | GDD }}</b>
         </div>
       </b-col>
diff --git a/frontend/src/components/DecayInformations/DecayInformation-DecayStartblock.vue b/frontend/src/components/DecayInformations/DecayInformation-DecayStartblock.vue
index 2ee9ecc2c..b7d8a42c0 100644
--- a/frontend/src/components/DecayInformations/DecayInformation-DecayStartblock.vue
+++ b/frontend/src/components/DecayInformations/DecayInformation-DecayStartblock.vue
@@ -4,12 +4,11 @@
       <b-col cols="12" class="text-center">
         <div>
           <div class="display-4">{{ $t('decay.Starting_block_decay') }}</div>
-          <div>{{ $t('decay.decay_introduced') }} :</div>
+          <div>{{ $t('decay.decay_introduced') }}</div>
         </div>
         <div>
           <span v-if="decay.start">
             {{ $d(new Date(decay.start), 'long') }}
-            {{ $i18n.locale === 'de' ? 'Uhr' : '' }}
           </span>
         </div>
       </b-col>
diff --git a/frontend/src/components/DecayInformations/DecayInformation-Long.vue b/frontend/src/components/DecayInformations/DecayInformation-Long.vue
index b5e1bbbe5..033d73560 100644
--- a/frontend/src/components/DecayInformations/DecayInformation-Long.vue
+++ b/frontend/src/components/DecayInformations/DecayInformation-Long.vue
@@ -15,7 +15,6 @@
         <div>
           <span>
             {{ $d(new Date(decay.start), 'long') }}
-            {{ $i18n.locale === 'de' ? 'Uhr' : '' }}
           </span>
         </div>
       </b-col>
diff --git a/frontend/src/components/GddSend/QrCode.vue b/frontend/src/components/GddSend/QrCode.vue
index 0146621ed..32e527cfe 100644
--- a/frontend/src/components/GddSend/QrCode.vue
+++ b/frontend/src/components/GddSend/QrCode.vue
@@ -1,5 +1,6 @@
 <template>
   <b-alert show variant="secondary">
+    <!-- eslint-disable-next-line @intlify/vue-i18n/no-v-html -->
     <span class="alert-text" v-html="$t('form.scann_code')"></span>
     <b-col v-show="!scan" lg="12" class="text-right">
       <a @click="toggle" class="nav-link pointer">
@@ -18,6 +19,7 @@
         <b-row>
           <b-col lg="8">
             <b-alert show variant="secondary">
+              <!-- eslint-disable-next-line @intlify/vue-i18n/no-v-html -->
               <span class="alert-text" v-html="$t('form.scann_code')"></span>
             </b-alert>
           </b-col>
diff --git a/frontend/src/components/GddSend/TransactionConfirmationLink.vue b/frontend/src/components/GddSend/TransactionConfirmationLink.vue
index 18eb0f25d..31ae01cc3 100644
--- a/frontend/src/components/GddSend/TransactionConfirmationLink.vue
+++ b/frontend/src/components/GddSend/TransactionConfirmationLink.vue
@@ -28,12 +28,14 @@
           <strong>{{ $t('gdd_per_link.decay-14-day') }}</strong>
         </b-col>
         <b-col class="text-right borderbottom">
-          <strong>~ {{ (amount * 0.028 * -1) | GDD }}</strong>
+          <strong>{{ $t('math.aprox') }} {{ (amount * 0.028 * -1) | GDD }}</strong>
         </b-col>
       </b-row>
       <b-row class="pr-3">
         <b-col class="text-right">{{ $t('form.new_balance') }}</b-col>
-        <b-col class="text-right">~ {{ (balance - amount - amount * 0.028) | GDD }}</b-col>
+        <b-col class="text-right">
+          {{ $t('math.aprox') }} {{ (balance - amount - amount * 0.028) | GDD }}
+        </b-col>
       </b-row>
     </b-container>
 
diff --git a/frontend/src/components/GddSend/TransactionConfirmationSend.vue b/frontend/src/components/GddSend/TransactionConfirmationSend.vue
index e05d42269..5e945ec20 100644
--- a/frontend/src/components/GddSend/TransactionConfirmationSend.vue
+++ b/frontend/src/components/GddSend/TransactionConfirmationSend.vue
@@ -15,7 +15,7 @@
           <label class="input-2" for="input-2">{{ $t('form.amount') }}</label>
           <b-input-group id="input-group-2" class="borderbottom" size="lg">
             <b-input-group-prepend class="p-2 d-none d-md-block gray-background">
-              <div class="m-1 mt-2">GDD</div>
+              <div class="m-1 mt-2">{{ $t('GDD') }}</div>
             </b-input-group-prepend>
 
             <div class="p-3">{{ (amount * -1) | GDD }}</div>
@@ -27,7 +27,7 @@
             <b-input-group-prepend class="d-none d-md-block gray-background">
               <b-icon icon="chat-right-text" class="display-4 m-3 mt-4"></b-icon>
             </b-input-group-prepend>
-            <div class="p-3">{{ memo ? memo : '-' }}</div>
+            <div class="p-3">{{ memo ? memo : $t('dash') }}</div>
           </b-input-group>
         </b-list-group>
       </b-col>
diff --git a/frontend/src/components/GddSend/TransactionForm.vue b/frontend/src/components/GddSend/TransactionForm.vue
index 991e165ce..845e749cc 100644
--- a/frontend/src/components/GddSend/TransactionForm.vue
+++ b/frontend/src/components/GddSend/TransactionForm.vue
@@ -76,7 +76,7 @@
                 <label class="input-2" for="input-2">{{ $t('form.amount') }}</label>
                 <b-input-group id="input-group-2" class="border border-default" size="lg">
                   <b-input-group-prepend class="p-2 d-none d-md-block">
-                    <div class="m-1 mt-2">GDD</div>
+                    <div class="m-1 mt-2">{{ $t('GDD') }}</div>
                   </b-input-group-prepend>
 
                   <b-form-input
diff --git a/frontend/src/components/GddSend/TransactionResultSendError.vue b/frontend/src/components/GddSend/TransactionResultSendError.vue
index ba6b4a238..daa593aec 100644
--- a/frontend/src/components/GddSend/TransactionResultSendError.vue
+++ b/frontend/src/components/GddSend/TransactionResultSendError.vue
@@ -19,7 +19,7 @@
             >
               {{ $t('transaction.receiverDeleted') }}
             </div>
-            <div v-else>({{ errorResult }})</div>
+            <div v-else>{{ errorResult }}</div>
           </div>
           <p class="text-center mt-3">
             <b-button variant="success" @click="$emit('on-reset')">{{ $t('form.close') }}</b-button>
diff --git a/frontend/src/components/GddTransactionListFooter.vue b/frontend/src/components/GddTransactionListFooter.vue
index 0e30d85dc..1e4961493 100644
--- a/frontend/src/components/GddTransactionListFooter.vue
+++ b/frontend/src/components/GddTransactionListFooter.vue
@@ -2,10 +2,12 @@
   <div>
     <b-list-group>
       <b-list-group-item v-if="count > 5">
+        <!-- eslint-disable @intlify/vue-i18n/no-v-html -->
         <router-link
           to="/transactions"
-          v-html="$t('transaction.show_all', { count: count })"
+          v-html="$t('transaction.show_all', { count })"
         ></router-link>
+        <!-- eslint-enable @intlify/vue-i18n/no-v-html -->
       </b-list-group-item>
     </b-list-group>
   </div>
diff --git a/frontend/src/components/Menu/Navbar.spec.js b/frontend/src/components/Menu/Navbar.spec.js
index 49765e0b3..f8cdc4bfa 100644
--- a/frontend/src/components/Menu/Navbar.spec.js
+++ b/frontend/src/components/Menu/Navbar.spec.js
@@ -54,31 +54,31 @@ describe('Navbar', () => {
         expect(wrapper.findAll('.nav-item').at(1).text()).toEqual('1234 GDD')
       })
 
-      it('has first nav-item "overview" in navbar', () => {
-        expect(wrapper.findAll('.nav-item').at(3).text()).toEqual('overview')
+      it('has first nav-item "navigation.overview" in navbar', () => {
+        expect(wrapper.findAll('.nav-item').at(3).text()).toEqual('navigation.overview')
       })
-      it('has first nav-item "send" in navbar', () => {
-        expect(wrapper.findAll('.nav-item').at(4).text()).toEqual('send')
+      it('has first nav-item "navigation.send" in navbar', () => {
+        expect(wrapper.findAll('.nav-item').at(4).text()).toEqual('navigation.send')
       })
-      it('has first nav-item "transactions" in navbar', () => {
-        expect(wrapper.findAll('.nav-item').at(5).text()).toEqual('transactions')
+      it('has first nav-item "navigation.transactions" in navbar', () => {
+        expect(wrapper.findAll('.nav-item').at(5).text()).toEqual('navigation.transactions')
       })
-      it('has first nav-item "my-profil" in navbar', () => {
-        expect(wrapper.findAll('.nav-item').at(6).text()).toEqual('site.navbar.my-profil')
+      it('has first nav-item "navigation.my-profil" in navbar', () => {
+        expect(wrapper.findAll('.nav-item').at(6).text()).toEqual('navigation.my-profil')
       })
 
       it('has a link to the members area', () => {
-        expect(wrapper.findAll('.nav-item').at(7).text()).toContain('members_area')
+        expect(wrapper.findAll('.nav-item').at(7).text()).toContain('navigation.members_area')
         expect(wrapper.findAll('.nav-item').at(7).find('a').attributes('href')).toBe(
           'https://elopage.com',
         )
       })
 
-      it('has first nav-item "admin_area" in navbar', () => {
-        expect(wrapper.findAll('.nav-item').at(8).text()).toEqual('admin_area')
+      it('has first nav-item "navigation.admin_area" in navbar', () => {
+        expect(wrapper.findAll('.nav-item').at(8).text()).toEqual('navigation.admin_area')
       })
-      it('has first nav-item "logout" in navbar', () => {
-        expect(wrapper.findAll('.nav-item').at(9).text()).toEqual('logout')
+      it('has first nav-item "navigation.logout" in navbar', () => {
+        expect(wrapper.findAll('.nav-item').at(9).text()).toEqual('navigation.logout')
       })
     })
   })
diff --git a/frontend/src/components/Menu/Navbar.vue b/frontend/src/components/Menu/Navbar.vue
index 1c6f71955..7de70b6d5 100644
--- a/frontend/src/components/Menu/Navbar.vue
+++ b/frontend/src/components/Menu/Navbar.vue
@@ -10,10 +10,10 @@
       </div>
 
       <b-navbar-nav class="ml-auto" is-nav>
-        <b-nav-item>{{ pending ? '—' : balance | amount }} GDD</b-nav-item>
+        <b-nav-item>{{ pending ? '—' : balance | amount }} {{ $t('GDD') }}</b-nav-item>
         <b-nav-item to="/profile" right class="d-none d-sm-none d-md-none d-lg-flex shadow-lg">
           <small>
-            {{ $store.state.firstName }} {{ $store.state.lastName }},
+            {{ $store.state.firstName }} {{ $store.state.lastName }}
             <b>{{ $store.state.email }}</b>
             <b-icon class="ml-3" icon="gear-fill" aria-hidden="true"></b-icon>
           </small>
@@ -32,40 +32,42 @@
           <b-link to="/profile">
             <small>
               {{ $store.state.firstName }}
-              {{ $store.state.lastName }},
+              {{ $store.state.lastName }}
               <b>{{ $store.state.email }}</b>
             </small>
           </b-link>
         </div>
         <b-nav-item to="/overview" class="mb-3">
           <b-icon icon="house" aria-hidden="true"></b-icon>
-          {{ $t('overview') }}
+          {{ $t('navigation.overview') }}
         </b-nav-item>
         <b-nav-item to="/send" class="mb-3">
           <b-icon icon="arrow-left-right" aria-hidden="true"></b-icon>
-          {{ $t('send') }}
+          {{ $t('navigation.send') }}
         </b-nav-item>
         <b-nav-item to="/transactions" class="mb-3">
           <b-icon icon="layout-text-sidebar-reverse" aria-hidden="true"></b-icon>
-          {{ $t('transactions') }}
+          {{ $t('navigation.transactions') }}
         </b-nav-item>
         <b-nav-item to="/profile" class="mb-3">
           <b-icon icon="gear" aria-hidden="true"></b-icon>
-          {{ $t('site.navbar.my-profil') }}
+          {{ $t('navigation.my-profil') }}
         </b-nav-item>
         <br />
         <b-nav-item :href="elopageUri" class="mb-3" target="_blank">
           <b-icon icon="link45deg" aria-hidden="true"></b-icon>
-          {{ $t('members_area') }}
-          <b-badge v-if="!$store.state.hasElopage" pill variant="danger">!</b-badge>
+          {{ $t('navigation.members_area') }}
+          <b-badge v-if="!$store.state.hasElopage" pill variant="danger">
+            {{ $t('math.exclaim') }}
+          </b-badge>
         </b-nav-item>
         <b-nav-item class="mb-3" v-if="$store.state.isAdmin" @click="$emit('admin')">
           <b-icon icon="shield-check" aria-hidden="true"></b-icon>
-          {{ $t('admin_area') }}
+          {{ $t('navigation.admin_area') }}
         </b-nav-item>
         <b-nav-item class="mb-3" @click="$emit('logout')">
           <b-icon icon="power" aria-hidden="true"></b-icon>
-          {{ $t('logout') }}
+          {{ $t('navigation.logout') }}
         </b-nav-item>
       </b-nav>
     </b-collapse>
diff --git a/frontend/src/components/Menu/Sidebar.spec.js b/frontend/src/components/Menu/Sidebar.spec.js
index 884269b9b..5579dc2a9 100644
--- a/frontend/src/components/Menu/Sidebar.spec.js
+++ b/frontend/src/components/Menu/Sidebar.spec.js
@@ -36,29 +36,29 @@ describe('Sidebar', () => {
         expect(wrapper.findAll('.nav-item')).toHaveLength(7)
       })
 
-      it('has first nav-item "overview" in navbar', () => {
-        expect(wrapper.findAll('.nav-item').at(0).text()).toEqual('overview')
+      it('has first nav-item "navigation.overview" in navbar', () => {
+        expect(wrapper.findAll('.nav-item').at(0).text()).toEqual('navigation.overview')
       })
 
-      it('has first nav-item "send" in navbar', () => {
-        expect(wrapper.findAll('.nav-item').at(1).text()).toEqual('send')
+      it('has first nav-item "navigation.send" in navbar', () => {
+        expect(wrapper.findAll('.nav-item').at(1).text()).toEqual('navigation.send')
       })
 
-      it('has first nav-item "transactions" in navbar', () => {
-        expect(wrapper.findAll('.nav-item').at(2).text()).toEqual('transactions')
+      it('has first nav-item "navigation.transactions" in navbar', () => {
+        expect(wrapper.findAll('.nav-item').at(2).text()).toEqual('navigation.transactions')
       })
-      it('has first nav-item "my-profil" in navbar', () => {
-        expect(wrapper.findAll('.nav-item').at(3).text()).toEqual('site.navbar.my-profil')
+      it('has first nav-item "navigation.my-profil" in navbar', () => {
+        expect(wrapper.findAll('.nav-item').at(3).text()).toEqual('navigation.my-profil')
       })
       it('has a link to the members area', () => {
-        expect(wrapper.findAll('.nav-item').at(4).text()).toContain('members_area')
+        expect(wrapper.findAll('.nav-item').at(4).text()).toContain('navigation.members_area')
         expect(wrapper.findAll('.nav-item').at(4).find('a').attributes('href')).toBe('#')
       })
-      it('has first nav-item "admin_area" in navbar', () => {
-        expect(wrapper.findAll('.nav-item').at(5).text()).toEqual('admin_area')
+      it('has first nav-item "navigation.admin_area" in navbar', () => {
+        expect(wrapper.findAll('.nav-item').at(5).text()).toEqual('navigation.admin_area')
       })
-      it('has first nav-item "logout" in navbar', () => {
-        expect(wrapper.findAll('.nav-item').at(6).text()).toEqual('logout')
+      it('has first nav-item "navigation.logout" in navbar', () => {
+        expect(wrapper.findAll('.nav-item').at(6).text()).toEqual('navigation.logout')
       })
     })
   })
diff --git a/frontend/src/components/Menu/Sidebar.vue b/frontend/src/components/Menu/Sidebar.vue
index 4341791f0..2ae4df0ef 100644
--- a/frontend/src/components/Menu/Sidebar.vue
+++ b/frontend/src/components/Menu/Sidebar.vue
@@ -6,35 +6,37 @@
         <b-nav vertical class="w-200">
           <b-nav-item to="/overview" class="mb-3">
             <b-icon icon="house" aria-hidden="true"></b-icon>
-            {{ $t('overview') }}
+            {{ $t('navigation.overview') }}
           </b-nav-item>
           <b-nav-item to="/send" class="mb-3">
             <b-icon icon="arrow-left-right" aria-hidden="true"></b-icon>
-            {{ $t('send') }}
+            {{ $t('navigation.send') }}
           </b-nav-item>
           <b-nav-item to="/transactions" class="mb-3">
             <b-icon icon="layout-text-sidebar-reverse" aria-hidden="true"></b-icon>
-            {{ $t('transactions') }}
+            {{ $t('navigation.transactions') }}
           </b-nav-item>
           <b-nav-item to="/profile" class="mb-3">
             <b-icon icon="gear" aria-hidden="true"></b-icon>
-            {{ $t('site.navbar.my-profil') }}
+            {{ $t('navigation.my-profil') }}
           </b-nav-item>
         </b-nav>
         <hr />
         <b-nav vertical class="w-100">
           <b-nav-item class="mb-3" :href="elopageUri" target="_blank">
             <b-icon icon="link45deg" aria-hidden="true"></b-icon>
-            {{ $t('members_area') }}
-            <b-badge v-if="!$store.state.hasElopage" pill variant="danger">!</b-badge>
+            {{ $t('navigation.members_area') }}
+            <b-badge v-if="!$store.state.hasElopage" pill variant="danger">
+              {{ $t('math.exclaim') }}
+            </b-badge>
           </b-nav-item>
           <b-nav-item class="mb-3" v-if="$store.state.isAdmin" @click="$emit('admin')">
             <b-icon icon="shield-check" aria-hidden="true"></b-icon>
-            {{ $t('admin_area') }}
+            {{ $t('navigation.admin_area') }}
           </b-nav-item>
           <b-nav-item class="mb-3" @click="$emit('logout')">
             <b-icon icon="power" aria-hidden="true"></b-icon>
-            {{ $t('logout') }}
+            {{ $t('navigation.logout') }}
           </b-nav-item>
         </b-nav>
       </div>
diff --git a/frontend/src/components/PaginationButtons.vue b/frontend/src/components/PaginationButtons.vue
index 3b80481c6..e5e465032 100644
--- a/frontend/src/components/PaginationButtons.vue
+++ b/frontend/src/components/PaginationButtons.vue
@@ -7,7 +7,7 @@
         </b-button>
       </b-col>
       <b-col cols="3">
-        <p class="text-center pt-2">{{ value }} / {{ totalPages }}</p>
+        <p class="text-center pt-2">{{ value }} {{ $t('math.div') }} {{ totalPages }}</p>
       </b-col>
       <b-col>
         <b-button class="next-page" :disabled="!hasNext" @click="currentValue++">
diff --git a/frontend/src/components/Status.vue b/frontend/src/components/Status.vue
index 92d00452d..cde1afbdb 100644
--- a/frontend/src/components/Status.vue
+++ b/frontend/src/components/Status.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="gdd-status">
     <div class="p-0 gdd-status-div">
-      {{ pending || balance === null ? '—' : $n(balance, 'decimal') }} {{ statusText }}
+      {{ pending || balance === null ? $t('dash') : $n(balance, 'decimal') }} {{ statusText }}
     </div>
   </div>
 </template>
diff --git a/frontend/src/components/Transaction.vue b/frontend/src/components/Transaction.vue
index acce0f7ff..ea651c663 100644
--- a/frontend/src/components/Transaction.vue
+++ b/frontend/src/components/Transaction.vue
@@ -51,7 +51,7 @@
             {{ $t('form.date') }}
           </b-col>
           <b-col cols="6">
-            {{ $d(new Date(date), 'long') }} {{ $i18n.locale === 'de' ? 'Uhr' : '' }}
+            {{ $d(new Date(date), 'long') }}
           </b-col>
         </b-row>
 
diff --git a/frontend/src/components/TransactionRows/DateRow.vue b/frontend/src/components/TransactionRows/DateRow.vue
index 5daccfa69..20e80ec2b 100644
--- a/frontend/src/components/TransactionRows/DateRow.vue
+++ b/frontend/src/components/TransactionRows/DateRow.vue
@@ -7,7 +7,6 @@
       <b-col cols="7">
         <div class="gdd-transaction-list-item-date">
           {{ $d(new Date(balanceDate), 'long') }}
-          {{ $i18n.locale === 'de' ? 'Uhr' : '' }}
         </div>
       </b-col>
     </b-row>
diff --git a/frontend/src/components/UserCard.vue b/frontend/src/components/UserCard.vue
index 728883109..915632860 100755
--- a/frontend/src/components/UserCard.vue
+++ b/frontend/src/components/UserCard.vue
@@ -15,18 +15,18 @@
             <div class="text-center font-weight-bold">
               {{ $n(balance, 'decimal') }}
             </div>
-            <div class="text-center">GDD</div>
+            <div class="text-center">{{ $t('GDD') }}</div>
           </b-col>
           <b-col>
             <div class="text-center font-weight-bold">
               {{ transactionCount }}
             </div>
             <div class="text-center">
-              {{ $t('transactions') }}
+              {{ $t('navigation.transactions') }}
             </div>
           </b-col>
           <b-col>
-            <div class="text-center font-weight-bold">--</div>
+            <div class="text-center font-weight-bold">{{ $t('dash') }}</div>
             <div class="text-center">
               {{ $t('community.community') }}
             </div>
diff --git a/frontend/src/layouts/ContentFooter.spec.js b/frontend/src/layouts/ContentFooter.spec.js
index 4b360d581..8d78f2f94 100644
--- a/frontend/src/layouts/ContentFooter.spec.js
+++ b/frontend/src/layouts/ContentFooter.spec.js
@@ -98,7 +98,7 @@ describe('ContentFooter', () => {
       })
 
       it('has a link to the members area', () => {
-        expect(wrapper.findAll('a.nav-link').at(2).text()).toEqual('members_area')
+        expect(wrapper.findAll('a.nav-link').at(2).text()).toEqual('navigation.members_area')
       })
 
       it('links to the elopage', () => {
diff --git a/frontend/src/layouts/ContentFooter.vue b/frontend/src/layouts/ContentFooter.vue
index de49e8635..bdcb5b1a9 100755
--- a/frontend/src/layouts/ContentFooter.vue
+++ b/frontend/src/layouts/ContentFooter.vue
@@ -3,24 +3,24 @@
     <b-row align-v="center" class="mt-4 justify-content-lg-between">
       <b-col>
         <div class="copyright text-center text-lg-center text-muted">
-          © {{ year }}
+          {{ $t('footer.copyright.year', { year }) }}
           <a
             :href="`https://gradido.net/${$i18n.locale}`"
             class="font-weight-bold ml-1"
             target="_blank"
           >
-            Gradido-Akademie
+            {{ $t('footer.copyright.link') }}
           </a>
-          |
+          {{ $t('math.pipe') }}
           <a href="https://github.com/gradido/gradido/releases/latest" target="_blank">
-            App version {{ version }}
+            {{ $t('footer.app_version', { version }) }}
           </a>
           <a
             v-if="hash"
             :href="'https://github.com/gradido/gradido/commit/' + hash"
             target="_blank"
           >
-            ({{ shortHash }})
+            {{ $t('footer.short_hash', { shortHash }) }}
           </a>
         </div>
       </b-col>
@@ -29,16 +29,16 @@
       <b-col>
         <b-nav class="nav-footer justify-content-center">
           <b-nav-item :href="`https://gradido.net/${$i18n.locale}/impressum/`" target="_blank">
-            {{ $t('imprint') }}
+            {{ $t('footer.imprint') }}
           </b-nav-item>
           <b-nav-item :href="`https://gradido.net/${$i18n.locale}/datenschutz/`" target="_blank">
-            {{ $t('privacy_policy') }}
+            {{ $t('footer.privacy_policy') }}
           </b-nav-item>
           <b-nav-item
             :href="`https://elopage.com/s/gradido/sign_in?locale=${$i18n.locale}`"
             target="_blank"
           >
-            {{ $t('members_area') }}
+            {{ $t('navigation.members_area') }}
           </b-nav-item>
           <b-nav-item
             :href="
@@ -48,10 +48,10 @@
             "
             target="_blank"
           >
-            {{ $t('whitepaper') }}
+            {{ $t('footer.whitepaper') }}
           </b-nav-item>
           <b-nav-item :href="`https://gradido.net/${$i18n.locale}/contact/`" target="_blank">
-            {{ $t('site.navbar.support') }}
+            {{ $t('navigation.support') }}
           </b-nav-item>
         </b-nav>
       </b-col>
diff --git a/frontend/src/locales/de.json b/frontend/src/locales/de.json
index 94b1e8eb0..4bf534c7f 100644
--- a/frontend/src/locales/de.json
+++ b/frontend/src/locales/de.json
@@ -1,5 +1,4 @@
 {
-  "admin_area": "Adminbereich",
   "advanced-calculation": "Vorausberechnung",
   "back": "Zurück",
   "community": {
@@ -27,8 +26,8 @@
     "created": "Geschöpft",
     "days": "Tage",
     "decay": "Vergänglichkeit",
-    "decayStart": " - Startblock für Vergänglichkeit am: ",
-    "decay_introduced": "Die Vergänglichkeit wurde eingeführt am ",
+    "decayStart": " - Startblock für Vergänglichkeit am:",
+    "decay_introduced": "Die Vergänglichkeit wurde eingeführt am:",
     "decay_since_last_transaction": "Vergänglichkeit seit der letzten Transaktion",
     "first_transaction": "Die erste Transaktion beinhaltet keine Vergänglichkeit.",
     "hours": "Stunden",
@@ -49,12 +48,23 @@
   "error": {
     "change-password": "Fehler beim Ändern des Passworts",
     "empty-transactionlist": "Es gab einen Fehler mit der Übermittlung der Anzahl deiner Transaktionen.",
-    "error": "Fehler",
+    "error": "Fehler!",
     "no-account": "Leider konnten wir keinen Account mit diesen Daten finden.",
     "no-email-verify": "Dein Konto wurde noch nicht bestätigt. Bitte überprüfe deine E-Mails und klicke auf den Aktivierungslink!",
     "no-transactionlist": "Es gab leider einen Fehler. Es wurden keine Transaktionen vom Server übermittelt",
     "session-expired": "Die Sitzung wurde aus Sicherheitsgründen beendet."
   },
+  "footer": {
+    "app_version": "App version {version}",
+    "copyright": {
+      "link": "Gradido-Akademie",
+      "year": "© {year}"
+    },
+    "imprint": "Impressum",
+    "privacy_policy": "Datenschutzerklärung",
+    "short_hash": "({shortHash})",
+    "whitepaper": "Whitepaper"
+  },
   "form": {
     "amount": "Betrag",
     "at": "am",
@@ -100,6 +110,7 @@
     },
     "your_amount": "Dein Betrag"
   },
+  "GDD": "GDD",
   "gdd_per_link": {
     "copy": "kopieren",
     "created": "Der Link wurde erstellt!",
@@ -130,19 +141,30 @@
     "raise": "Erhöhung",
     "recruited-member": "Eingeladenes Mitglied"
   },
-  "imprint": "Impressum",
   "language": "Sprache",
   "login": "Anmeldung",
-  "logout": "Abmelden",
-  "members_area": "Mitgliederbereich",
+  "math": {
+    "aprox": "~",
+    "div": "/",
+    "equal": "=",
+    "pipe": "|",
+    "exclaim": "!"
+  },
   "message": "hallo gradido!!",
-  "overview": "Übersicht",
-  "privacy_policy": "Datenschutzerklärung",
+  "navigation": {
+    "admin_area": "Adminbereich",
+    "my-profil": "Mein Profil",
+    "support": "Support",
+    "overview": "Übersicht",
+    "transactions": "Transaktionen",
+    "send": "Senden",
+    "logout": "Abmelden",
+    "members_area": "Mitgliederbereich"
+  },
   "publisher": {
     "infoText": "Wenn dir dein Empfehlungsgeber seine Publisher-Id gegeben hat, trage sie hier ein, sonst lass das Feld bitte unverändert!",
-    "publisherId": "Publisher-Id"
+    "publisherId": "Publisher-Id:"
   },
-  "send": "Senden",
   "send_gdd": "GDD versenden",
   "send_per_link": "GDD versenden per Link",
   "settings": {
@@ -197,13 +219,10 @@
     },
     "login": {
       "community": "Tausend Dank, weil du bei uns bist!",
+      "heading": "Gradido",
       "new_wallet": "Neues Konto erstellen",
       "signin": "Anmelden"
     },
-    "navbar": {
-      "my-profil": "Mein Profil",
-      "support": "Support"
-    },
     "signup": {
       "agree": "Ich stimme der <a href='https://gradido.net/de/datenschutz/' target='_blank' >Datenschutzerklärung</a> zu.",
       "dont_match": "Die Passwörter stimmen nicht überein.",
@@ -241,6 +260,4 @@
     "button": "einlösen",
     "send_you": "sendet dir"
   },
-  "transactions": "Transaktionen",
-  "whitepaper": "Whitepaper"
 }
diff --git a/frontend/src/locales/en.json b/frontend/src/locales/en.json
index 685ca499f..d396e57f2 100644
--- a/frontend/src/locales/en.json
+++ b/frontend/src/locales/en.json
@@ -1,5 +1,4 @@
 {
-  "admin_area": "Admin Area",
   "advanced-calculation": "Advanced calculation",
   "back": "Back",
   "community": {
@@ -27,8 +26,8 @@
     "created": "Created",
     "days": "Days",
     "decay": "Decay",
-    "decayStart": " - Starting block for decay at: ",
-    "decay_introduced": "Decay was introduced on",
+    "decayStart": " - Starting block for decay at:",
+    "decay_introduced": "Decay was introduced on:",
     "decay_since_last_transaction": "Decay since the last transaction",
     "first_transaction": "The first transaction does not include decay.",
     "hours": "Hours",
@@ -49,12 +48,23 @@
   "error": {
     "change-password": "Error while changing password",
     "empty-transactionlist": "There was an error with the transmission of the number of your transactions.",
-    "error": "Error",
+    "error": "Error!",
     "no-account": "Unfortunately we could not find an account to the given data!",
     "no-email-verify": "Your account has not been confirmed yet. Please check your emails and click on the activation link!",
     "no-transactionlist": "Unfortunately, there was an error. No transactions have been sent from the server.",
     "session-expired": "The session was closed for security reasons."
   },
+  "footer": {
+    "app_version": "App version {version}",
+    "copyright": {
+      "link": "Gradido-Akademie",
+      "year": "© {year}"
+    },
+    "imprint": "Legal notice",
+    "privacy_policy": "Privacy policy",
+    "short_hash": "({shortHash})",
+    "whitepaper": "Whitepaper"
+  },
   "form": {
     "amount": "Amount",
     "at": "at",
@@ -130,19 +140,31 @@
     "raise": "Increase",
     "recruited-member": "Invited member"
   },
-  "imprint": "Legal notice",
   "language": "Language",
   "login": "Login",
-  "logout": "Logout",
-  "members_area": "Members area",
+  "math": {
+    "aprox": "~",
+    "div": "/",
+    "equal": "=",
+    "pipe": "|",
+    "exclaim": "!"
+  },
+  "dash": "—",
   "message": "hello gradido !!",
-  "overview": "Overview",
-  "privacy_policy": "Privacy policy",
+  "navigation": {
+    "admin_area": "Admin Area",
+    "my-profil": "My profile",
+    "support": "Support",
+    "overview": "Overview",
+    "transactions": "Transactions",
+    "send": "Send",
+    "logout": "Logout",
+    "members_area": "Members area"
+  },
   "publisher": {
     "infoText": "If your referrer has given you his publisher id, enter it here, otherwise leave the field unchanged!",
-    "publisherId": "PublisherID"
+    "publisherId": "PublisherID:"
   },
-  "send": "Send",
   "send_gdd": "GDD send",
   "send_per_link": "GDD send via link",
   "settings": {
@@ -197,13 +219,10 @@
     },
     "login": {
       "community": "A thousand thanks for being with us!",
+      "heading": "Gradido",
       "new_wallet": "Create new account",
       "signin": "Sign in"
     },
-    "navbar": {
-      "my-profil": "My profile",
-      "support": "Support"
-    },
     "signup": {
       "agree": "I agree to the <a href='https://gradido.net/en/datenschutz/' target='_blank' > privacy policy</a>.",
       "dont_match": "Passwords don't match.",
@@ -240,7 +259,5 @@
   "transaction-link": {
     "button": "redeem",
     "send_you": "wants to send you"
-  },
-  "transactions": "Transactions",
-  "whitepaper": "Whitepaper"
+  }
 }
diff --git a/frontend/src/pages/Login.vue b/frontend/src/pages/Login.vue
index 7165fa677..9d33678f5 100755
--- a/frontend/src/pages/Login.vue
+++ b/frontend/src/pages/Login.vue
@@ -6,7 +6,7 @@
         <div class="text-center mb-7 header">
           <b-row class="justify-content-center">
             <b-col xl="5" lg="6" md="8" class="px-2">
-              <h1>Gradido</h1>
+              <h1>{{ $t('site.login.heading') }}</h1>
               <p class="text-lead">{{ $t('site.login.community') }}</p>
             </b-col>
           </b-row>
diff --git a/frontend/src/pages/Register.vue b/frontend/src/pages/Register.vue
index aec2ef1be..609182765 100755
--- a/frontend/src/pages/Register.vue
+++ b/frontend/src/pages/Register.vue
@@ -100,6 +100,7 @@
                         v-model="form.agree"
                         :name="$t('site.signup.agree')"
                       >
+                        <!-- eslint-disable-next-line @intlify/vue-i18n/no-v-html -->
                         <span class="text-muted" v-html="$t('site.signup.agree')"></span>
                       </b-form-checkbox>
                     </b-col>
@@ -113,14 +114,12 @@
                   >
                     <span class="alert-icon"><i class="ni ni-point"></i></span>
                     <span class="alert-text">
-                      <strong>{{ $t('error.error') }}!</strong>
+                      <strong>{{ $t('error.error') }}</strong>
                       {{ messageError }}
                     </span>
                   </b-alert>
                   <b-row v-b-toggle:my-collapse class="text-muted shadow-sm p-3 publisherCollaps">
-                    <b-col>
-                      {{ $t('publisher.publisherId') }} : {{ $store.state.publisherId }}
-                    </b-col>
+                    <b-col>{{ $t('publisher.publisherId') }} {{ $store.state.publisherId }}</b-col>
                     <b-col class="text-right">
                       <b-icon icon="chevron-down" aria-hidden="true"></b-icon>
                     </b-col>
diff --git a/frontend/src/validation-rules.js b/frontend/src/validation-rules.js
index f0865d251..59facf65e 100644
--- a/frontend/src/validation-rules.js
+++ b/frontend/src/validation-rules.js
@@ -17,21 +17,25 @@ export const loadAllRules = (i18nCallback) => {
 
   extend('email', {
     ...email,
+    // eslint-disable-next-line  @intlify/vue-i18n/no-missing-keys
     message: (_, values) => i18nCallback.t('validations.messages.email', values),
   })
 
   extend('required', {
     ...required,
+    // eslint-disable-next-line  @intlify/vue-i18n/no-missing-keys
     message: (_, values) => i18nCallback.t('validations.messages.required', values),
   })
 
   extend('min', {
     ...min,
+    // eslint-disable-next-line  @intlify/vue-i18n/no-missing-keys
     message: (_, values) => i18nCallback.t('validations.messages.min', values),
   })
 
   extend('max', {
     ...max,
+    // eslint-disable-next-line  @intlify/vue-i18n/no-missing-keys
     message: (_, values) => i18nCallback.t('validations.messages.max', values),
   })