From 98bb217f6e3147f3cc01b8676086c42a5f7a7ef6 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Tue, 7 Jun 2022 11:31:55 +0200
Subject: [PATCH] fixed lint and locales

---
 admin/.eslintrc.js                            |  2 +-
 admin/src/components/ContributionLinkForm.vue | 14 ++++----
 admin/src/locales/de.json                     | 33 +++++++++----------
 admin/src/locales/en.json                     | 28 ++++++++--------
 4 files changed, 38 insertions(+), 39 deletions(-)

diff --git a/admin/.eslintrc.js b/admin/.eslintrc.js
index 73dce291f..33ab3c0c5 100644
--- a/admin/.eslintrc.js
+++ b/admin/.eslintrc.js
@@ -39,7 +39,7 @@ module.exports = {
       {
         src: './src',
         extensions: ['.js', '.vue'],
-        ignores: [],
+        ignores: ['contributionLink.options.repetition.null'],
         enableFix: false,
       },
     ],
diff --git a/admin/src/components/ContributionLinkForm.vue b/admin/src/components/ContributionLinkForm.vue
index a388ab0d7..6e958f125 100644
--- a/admin/src/components/ContributionLinkForm.vue
+++ b/admin/src/components/ContributionLinkForm.vue
@@ -7,7 +7,7 @@
       <!-- Date -->
       <b-row>
         <b-col>
-          <b-form-group id="input-group-4" :label="$t('contributionLink.startDate')">
+          <b-form-group :label="$t('contributionLink.startDate')">
             <b-form-datepicker
               v-model="form.startDate"
               size="lg"
@@ -19,7 +19,7 @@
           </b-form-group>
         </b-col>
         <b-col>
-          <b-form-group id="input-group-4" :label="$t('contributionLink.endDate')">
+          <b-form-group :label="$t('contributionLink.endDate')">
             <b-form-datepicker
               v-model="form.endDate"
               size="lg"
@@ -33,7 +33,7 @@
       </b-row>
 
       <!-- Name -->
-      <b-form-group id="input-group-1" :label="$t('contributionLink.name')">
+      <b-form-group :label="$t('contributionLink.name')">
         <b-form-input
           v-model="form.name"
           size="lg"
@@ -43,7 +43,7 @@
         ></b-form-input>
       </b-form-group>
       <!-- Desc -->
-      <b-form-group id="input-group-2" :label="$t('contributionLink.memo')">
+      <b-form-group :label="$t('contributionLink.memo')">
         <b-form-textarea
           v-model="form.memo"
           size="lg"
@@ -52,7 +52,7 @@
         ></b-form-textarea>
       </b-form-group>
       <!-- Amount -->
-      <b-form-group id="input-group-3" :label="$t('contributionLink.amount')">
+      <b-form-group :label="$t('contributionLink.amount')">
         <b-form-input
           v-model="form.amount"
           size="lg"
@@ -98,7 +98,9 @@
       </b-jumbotron>
       <div class="mt-6">
         <b-button type="submit" variant="primary">{{ $t('contributionLink.create') }}</b-button>
-        <b-button type="reset" variant="danger" @click.prevent="onReset">{{ $t('contributionLink.clear') }}</b-button>
+        <b-button type="reset" variant="danger" @click.prevent="onReset">
+          {{ $t('contributionLink.clear') }}
+        </b-button>
       </div>
     </b-form>
   </div>
diff --git a/admin/src/locales/de.json b/admin/src/locales/de.json
index 4e871f4a4..d56c9ee3d 100644
--- a/admin/src/locales/de.json
+++ b/admin/src/locales/de.json
@@ -1,17 +1,17 @@
 {
   "all_emails": "Alle Nutzer",
   "contributionLink": {
-    "repetition":"Wiederholung",
-    "cycle":"Zyclus",
-    "maximumAmount":"maximaler Betrag",
-    "create":"Anlegen",
-    "clear":"Löschen",
-    "startDate":"Start-Datum",
-    "endDate":"End-Datum",
-    "name":"Name",
-    "memo":"Nachricht",
+    "repetition": "Wiederholung",
+    "cycle": "Zyclus",
+    "maximumAmount": "maximaler Betrag",
+    "create": "Anlegen",
+    "clear": "Löschen",
+    "startDate": "Start-Datum",
+    "endDate": "End-Datum",
+    "name": "Name",
+    "memo": "Nachricht",
     "amount": "Betrag",
-    "options" :{
+    "options": {
       "cycle": {
         "null": "Bitter wähle einen Zyclus",
         "none": "kein Zyclus",
@@ -23,11 +23,10 @@
       },
       "repetition": {
         "null": "Bitte wähle eine Wiederholung"
-      },
-      "noStartDate":"Kein Start-Datum gewählt.",
-      "noEndDate":"Kein End-Datum gewählt."
-
-    }
+      }
+    },
+    "noStartDate": "Kein Start-Datum gewählt.",
+    "noEndDate": "Kein End-Datum gewählt."
   },
   "back": "zurück",
   "creation": "Schöpfung",
@@ -103,9 +102,7 @@
   "removeNotSelf": "Als Admin / Moderator kannst du dich nicht selber löschen.",
   "remove_all": "alle Nutzer entfernen",
   "save": "Speichern",
-  "selectOptions": {
-
-  },
+  "selectOptions": {},
   "status": "Status",
   "success": "Erfolg",
   "text": "Text",
diff --git a/admin/src/locales/en.json b/admin/src/locales/en.json
index db86e277d..81ac6a99c 100644
--- a/admin/src/locales/en.json
+++ b/admin/src/locales/en.json
@@ -1,17 +1,17 @@
 {
   "all_emails": "All users",
   "contributionLink": {
-    "repetition":"Repetition",
-    "cycle":"Cycle",
-    "maximumAmount":"Maximum amount",
-    "create":"Create",
-    "clear":"Clear",
-    "startDate":"Start-Date",
-    "endDate":"End-Date",
-    "name":"Name",
-    "memo":"Memo",
+    "repetition": "Repetition",
+    "cycle": "Cycle",
+    "maximumAmount": "Maximum amount",
+    "create": "Create",
+    "clear": "Clear",
+    "startDate": "Start-Date",
+    "endDate": "End-Date",
+    "name": "Name",
+    "memo": "Memo",
     "amount": "Amount",
-    "options" :{
+    "options": {
       "cycle": {
         "null": "Please select an cycle",
         "none": "no cycle",
@@ -23,10 +23,10 @@
       },
       "repetition": {
         "null": "Please select an repetition"
-      },
-      "noStartDate":"No start Date",
-      "noEndDate":"No end Date"
-    }
+      }
+    },
+    "noStartDate": "No start Date",
+    "noEndDate": "No end Date"
   },
   "back": "back",
   "creation": "Creation",