Merge branch 'master' into fix-locales-nederlands

frontend/.eslintrc.js

@@ -68,7 +68,7 @@ module.exports = {
   },
   settings: {
     'vue-i18n': {
-      localeDir: './src/locales/*.json',
+      localeDir: './src/locales/{en,de}.json',
       // Specify the version of `vue-i18n` you are using.
       // If not specified, the message will be parsed twice.
       messageSyntaxVersion: '^8.22.4',

frontend/src/locales/de.json

@@ -21,14 +21,12 @@
     "community": "Gemeinschaft",
     "continue-to-registration": "Weiter zur Registrierung",
     "current-community": "Aktuelle Gemeinschaft",
-    "members": "Mitglieder",
     "moderator": "Moderator",
     "moderators": "Moderatoren",
     "myContributions": "Meine Beiträge zum Gemeinwohl",
     "openContributionLinks": "öffentliche Beitrags-Linkliste",
     "openContributionLinkText": "Folgende {count} automatische Schöpfungen werden zur Zeit durch die Gemeinschaft „{name}“ bereitgestellt.",
     "other-communities": "Weitere Gemeinschaften",
-    "statistic": "Statistik",
     "submitContribution": "Beitrag einreichen",
     "switch-to-this-community": "zu dieser Gemeinschaft wechseln"
   },
@@ -307,11 +305,6 @@
       "uppercase": "Großbuchstabe erforderlich."
     }
   },
-  "statistic": {
-    "totalGradidoAvailable": "GDD insgesamt im Umlauf",
-    "totalGradidoCreated": "GDD insgesamt geschöpft",
-    "totalGradidoDecayed": "GDD insgesamt verfallen"
-  },
   "success": "Erfolg",
   "time": {
     "days": "Tage",

frontend/src/locales/en.json

@@ -21,14 +21,12 @@
     "community": "Community",
     "continue-to-registration": "Continue to registration",
     "current-community": "Current community",
-    "members": "Members",
     "moderator": "Moderator",
     "moderators": "Moderators",
     "myContributions": "My contributions to the common good",
     "openContributionLinks": "open Contribution links list",
     "openContributionLinkText": "The following {count} automatic creations are currently provided by the \"{name}\" community.",
     "other-communities": "Other communities",
-    "statistic": "Statistics",
     "submitContribution": "Submit contribution",
     "switch-to-this-community": "Switch to this community"
   },
@@ -307,11 +305,6 @@
       "uppercase": "One uppercase letter required."
     }
   },
-  "statistic": {
-    "totalGradidoAvailable": "Total GDD in circulation",
-    "totalGradidoCreated": "Total GDD created",
-    "totalGradidoDecayed": "Total GDD decayed"
-  },
   "success": "Success",
   "time": {
     "days": "Days",

frontend/src/pages/InfoStatistic.spec.js

@@ -98,7 +98,7 @@ describe('InfoStatistic', () => {
       )
     })
 
-    it('calls getCommunityStatistics', () => {
+    it.skip('calls getCommunityStatistics', () => {
       expect(apolloQueryMock).toBeCalledWith(
         expect.objectContaining({
           query: communityStatistics,
@@ -115,12 +115,12 @@ describe('InfoStatistic', () => {
         wrapper = Wrapper()
       })
 
-      it('toasts three error messages', () => {
+      it('toasts two error messages', () => {
         expect(toastErrorSpy).toBeCalledWith(
           'listContributionLinks has no result, use default data',
         )
         expect(toastErrorSpy).toBeCalledWith('searchAdminUsers has no result, use default data')
-        expect(toastErrorSpy).toBeCalledWith('communityStatistics has no result, use default data')
+        // expect(toastErrorSpy).toBeCalledWith('communityStatistics has no result, use default data')
       })
     })
   })

frontend/src/pages/InfoStatistic.vue

@@ -43,6 +43,7 @@
       </ul>
       <b-link href="mailto: abc@example.com">{{ supportMail }}</b-link>
     </b-container>
+    <!-- 
     <hr />
     <b-container>
       <div class="h3">{{ $t('community.statistic') }}</div>
@@ -65,11 +66,13 @@
         </div>
       </div>
     </b-container>
+    -->
   </div>
 </template>
 <script>
 import CONFIG from '@/config'
-import { listContributionLinks, communityStatistics, searchAdminUsers } from '@/graphql/queries'
+import { listContributionLinks, searchAdminUsers } from '@/graphql/queries'
+// , communityStatistics
 
 export default {
   name: 'InfoStatistic',
@@ -115,23 +118,25 @@ export default {
           this.toastError('searchAdminUsers has no result, use default data')
         })
     },
-    getCommunityStatistics() {
-      this.$apollo
+    /*
+        getCommunityStatistics() {
+        this.$apollo
         .query({
-          query: communityStatistics,
+        query: communityStatistics,
         })
         .then((result) => {
-          this.totalUsers = result.data.communityStatistics.totalUsers
-          this.totalGradidoCreated = result.data.communityStatistics.totalGradidoCreated
-          this.totalGradidoDecayed =
-            Number(result.data.communityStatistics.totalGradidoDecayed) +
-            Number(result.data.communityStatistics.totalGradidoUnbookedDecayed)
-          this.totalGradidoAvailable = result.data.communityStatistics.totalGradidoAvailable
+        this.totalUsers = result.data.communityStatistics.totalUsers
+        this.totalGradidoCreated = result.data.communityStatistics.totalGradidoCreated
+        this.totalGradidoDecayed =
+        Number(result.data.communityStatistics.totalGradidoDecayed) +
+        Number(result.data.communityStatistics.totalGradidoUnbookedDecayed)
+        this.totalGradidoAvailable = result.data.communityStatistics.totalGradidoAvailable
         })
         .catch(() => {
-          this.toastError('communityStatistics has no result, use default data')
+        this.toastError('communityStatistics has no result, use default data')
         })
-    },
+        },
+      */
     updateTransactions(pagination) {
       this.$emit('update-transactions', pagination)
     },
@@ -139,7 +144,7 @@ export default {
   created() {
     this.getContributionLinks()
     this.getAdminUsers()
-    this.getCommunityStatistics()
+    // this.getCommunityStatistics()
     this.updateTransactions(0)
   },
 }