From bd8b24a6f032ba297609d4ebbe92be191594c27d Mon Sep 17 00:00:00 2001 From: Ulf Gebhardt Date: Tue, 15 Mar 2022 04:16:14 +0100 Subject: [PATCH] thinks are linting and language files are sorted. TODO: its unclear which dynamic key are missing --- frontend/.eslintrc.js | 14 ++-- frontend/package.json | 2 +- frontend/public/json-example/example.json | 0 .../{missing-keys.sh => missing-keys.sh.old} | 0 ...c.js => UserCard_FormUserMail.spec.js.old} | 4 +- ...Mail.vue => UserCard_FormUserMail.vue.old} | 4 +- frontend/src/locales/de.json | 83 ++++--------------- frontend/src/locales/en.json | 83 ++++--------------- 8 files changed, 40 insertions(+), 150 deletions(-) delete mode 100644 frontend/public/json-example/example.json rename frontend/scripts/{missing-keys.sh => missing-keys.sh.old} (100%) rename frontend/src/components/{UserCard_FormUserMail.spec.js => UserCard_FormUserMail.spec.js.old} (95%) rename frontend/src/components/{UserCard_FormUserMail.vue => UserCard_FormUserMail.vue.old} (93%) diff --git a/frontend/.eslintrc.js b/frontend/.eslintrc.js index d0d93b264..51e390605 100644 --- a/frontend/.eslintrc.js +++ b/frontend/.eslintrc.js @@ -20,6 +20,10 @@ module.exports = { { files: ['*.json'], extends: ['plugin:@intlify/vue-i18n/recommended'], + rules: { + // TODO: enable + '@intlify/vue-i18n/no-html-messages': 'off', + }, }, ], // add your custom rules here @@ -34,21 +38,17 @@ module.exports = { }, ], '@intlify/vue-i18n/no-dynamic-keys': 'error', + // TODO: no ignores '@intlify/vue-i18n/no-unused-keys': [ 'error', { src: './src', extensions: ['.js', '.vue'], - ignores: ['/site.thx./'], + ignores: ['/site.thx./', '/form./'], enableFix: false, }, ], - '@intlify/vue-i18n/no-missing-keys-in-other-locales': [ - 'error', - { - ignoreLocales: [], - }, - ], + '@intlify/vue-i18n/no-missing-keys-in-other-locales': 'error', 'prettier/prettier': [ 'error', { diff --git a/frontend/package.json b/frontend/package.json index f895cdb8b..1b4f5a31d 100755 --- a/frontend/package.json +++ b/frontend/package.json @@ -12,7 +12,7 @@ "stylelint": "stylelint --max-warnings=0 '**/*.{scss,vue}'", "i18n:report": "vue-cli-service i18n:report --src './src/**/*.?(js|vue)' --locales './src/locales/**/*.json'", "test": "TZ=UTC jest --coverage", - "locales": "scripts/missing-keys.sh && scripts/sort.sh" + "locales": "scripts/sort.sh" }, "dependencies": { "@babel/core": "^7.13.13", diff --git a/frontend/public/json-example/example.json b/frontend/public/json-example/example.json deleted file mode 100644 index e69de29bb..000000000 diff --git a/frontend/scripts/missing-keys.sh b/frontend/scripts/missing-keys.sh.old similarity index 100% rename from frontend/scripts/missing-keys.sh rename to frontend/scripts/missing-keys.sh.old diff --git a/frontend/src/components/UserCard_FormUserMail.spec.js b/frontend/src/components/UserCard_FormUserMail.spec.js.old similarity index 95% rename from frontend/src/components/UserCard_FormUserMail.spec.js rename to frontend/src/components/UserCard_FormUserMail.spec.js.old index cc4911683..f59f610ee 100644 --- a/frontend/src/components/UserCard_FormUserMail.spec.js +++ b/frontend/src/components/UserCard_FormUserMail.spec.js.old @@ -42,8 +42,8 @@ describe('UserCard_FormUserMail', () => { expect(wrapper.find('a[href="#formusermail"]').exists()).toBeTruthy() }) - it('renders the E-Mail form.change', () => { - expect(wrapper.findAll('div.col').at(0).text()).toBe('E-Mail form.change') + it('renders the form.email form.change', () => { + expect(wrapper.findAll('div.col').at(0).text()).toBe('form.email form.change') }) it('renders the E-Mail', () => { diff --git a/frontend/src/components/UserCard_FormUserMail.vue b/frontend/src/components/UserCard_FormUserMail.vue.old similarity index 93% rename from frontend/src/components/UserCard_FormUserMail.vue rename to frontend/src/components/UserCard_FormUserMail.vue.old index e0d013973..8d7677c35 100644 --- a/frontend/src/components/UserCard_FormUserMail.vue +++ b/frontend/src/components/UserCard_FormUserMail.vue.old @@ -4,7 +4,7 @@ - E-Mail {{ $t('form.change') }} + {{ $t('form.email') }} {{ $t('form.change') }}
@@ -21,7 +21,7 @@ - E-Mail + {{ $t('form.email') }} {{ $store.state.email }} diff --git a/frontend/src/locales/de.json b/frontend/src/locales/de.json index 4bf534c7f..a036f2c61 100644 --- a/frontend/src/locales/de.json +++ b/frontend/src/locales/de.json @@ -3,54 +3,29 @@ "back": "Zurück", "community": { "choose-another-community": "Eine andere Gemeinschaft auswählen", - "communities": { - "form": { - "date_period": "Datum / Zeitraum", - "hours": "Stunden", - "hours_report": "Stundenbericht", - "more_hours": "weitere Stunden", - "submit": "Einreichen" - } - }, "community": "Gemeinschaft", "continue-to-registration": "Weiter zur Registrierung", "current-community": "Aktuelle Gemeinschaft", - "location": "Ort:", "other-communities": "Weitere Gemeinschaften", "switch-to-this-community": "zu dieser Gemeinschaft wechseln" }, + "dash": "—", "decay": { "before_startblock_transaction": "Diese Transaktion beinhaltet keine Vergänglichkeit.", "calculation_decay": "Berechnung der Vergänglichkeit", "calculation_total": "Berechnung der Gesamtsumme", - "created": "Geschöpft", - "days": "Tage", "decay": "Vergänglichkeit", - "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", "last_transaction": "Letzte Transaktion", - "minutes": "Minuten", - "months": "Monate", - "noDecay": "Keine Vergänglichkeit", "past_time": "Vergangene Zeit", - "receive": "Empfangen", - "seconds": "Sekunden", - "send": "Gesendet", - "since_introduction": "seit Einführung der Vergänglichkeit", "Starting_block_decay": "Startblock Vergänglichkeit", - "toCommunity": "An die Gemeinschaft", - "total": "Gesamt", - "year": "Jahre" + "total": "Gesamt" }, "error": { - "change-password": "Fehler beim Ändern des Passworts", "empty-transactionlist": "Es gab einen Fehler mit der Übermittlung der Anzahl deiner Transaktionen.", "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." }, @@ -118,14 +93,9 @@ "header": "Gradidos versenden per Link", "link-copied": "Link wurde in die Zwischenablage kopiert", "not-copied": "Konnte den Link nicht kopieren: {err}", - "sentence_1": "Wähle einen Betrag aus, welchen du per Link versenden möchtest. Du kannst auch noch eine Nachricht eintragen. Beim Klick „jetzt generieren“ wird ein Link erstellt, den du versenden kannst.", - "sentence_2": "Der Link ist 14 Tage gültig!", - "sentence_3": "Wird der Link nicht innerhalb der 14 Tage Frist abgerufen, wird er automatisch gelöscht. Der Betrag wird dann wieder deinem Konto gutgeschrieben.", - "sentence_4": "Wer den Link aktiviert, erhält die Zahlung von deinem Konto. Wer noch nicht Mitglied bei Gradido ist, wird durch den Registrierungsprozess geleitet und bekommt den GDD Betrag nach Registrierung / Bestätigung seines Gradido Kontos gut geschrieben.", - "sentence_5": "Der Vergänglichkeitsbetrag wird von dir getragen und für die maximale Gültigkeit deinem Betrag aufgerechnet. Dir wird aber nur der Betrag als Vergänglichkeit berechnet, je nachdem wie viel Tage bis zum Einlösen des Links vergangen sind. Bis zum Einlösen wird die Vergänglichkeit für den gesamten Zeitraum der Gültigkeit vorgehalten." + "sentence_1": "Wähle einen Betrag aus, welchen du per Link versenden möchtest. Du kannst auch noch eine Nachricht eintragen. Beim Klick „jetzt generieren“ wird ein Link erstellt, den du versenden kannst." }, "gdt": { - "action": "Aktion", "calculation": "Berechnung der GradidoTransform", "contribution": "Beitrag", "conversion": "Umrechnung", @@ -147,19 +117,18 @@ "aprox": "~", "div": "/", "equal": "=", - "pipe": "|", - "exclaim": "!" + "exclaim": "!", + "pipe": "|" }, - "message": "hallo gradido!!", "navigation": { "admin_area": "Adminbereich", - "my-profil": "Mein Profil", - "support": "Support", - "overview": "Übersicht", - "transactions": "Transaktionen", - "send": "Senden", "logout": "Abmelden", - "members_area": "Mitgliederbereich" + "members_area": "Mitgliederbereich", + "my-profil": "Mein Profil", + "overview": "Übersicht", + "send": "Senden", + "support": "Support", + "transactions": "Transaktionen" }, "publisher": { "infoText": "Wenn dir dein Empfehlungsgeber seine Publisher-Id gegeben hat, trage sie hier ein, sonst lass das Feld bitte unverändert!", @@ -177,7 +146,6 @@ "changeLanguage": "Sprache ändern", "de": "Deutsch", "en": "English", - "select_language": "Bitte wähle eine Sprache.", "success": "Deine Sprache wurde erfolgreich geändert." }, "name": { @@ -191,37 +159,15 @@ }, "password": { "change-password": "Passwort ändern", - "forgot_pwd": "Passwort vergessen?", - "not-authenticated": "Leider konnten wir dich nicht authentifizieren. Bitte wende dich an den Support.", - "resend_subtitle": "Dein Aktivierungslink ist abgelaufen. Du kannst hier ein neuen anfordern.", - "reset": "Passwort zurücksetzen", - "reset-password": { - "text": "Gib nun ein neues Passwort ein, mit dem du dich zukünftig in deinem Gradido-Konto anmelden willst." - }, - "send_now": "Jetzt senden", - "set": "Passwort festlegen", - "set-password": { - "text": "Speichere nun dein neues Passwort, mit dem du dich zukünftig in deinem Gradido-Konto anmelden kannst." - }, - "subtitle": "Wenn du dein Passwort vergessen hast, kannst du es hier zurücksetzen." + "forgot_pwd": "Passwort vergessen?" } }, "signup": "Registrieren", "site": { - "404": { - "back": "Zurück zur Übersicht", - "ooops": "Ooops!", - "text": "Seite nicht gefunden. Aber keine Sorge, wir haben noch viele andere Seiten zu erkunden." - }, - "checkEmail": { - "errorText": "E-Mail konnte nicht verifiziert werden.", - "title": "E-Mail wird verifiziert" - }, "login": { "community": "Tausend Dank, weil du bei uns bist!", "heading": "Gradido", - "new_wallet": "Neues Konto erstellen", - "signin": "Anmelden" + "new_wallet": "Neues Konto erstellen" }, "signup": { "agree": "Ich stimme der Datenschutzerklärung zu.", @@ -250,7 +196,6 @@ "transaction": { "gdd-text": "Gradido Transaktionen", "gdt-text": "GradidoTransform Transaktionen", - "more": "mehr", "nullTransactions": "Du hast noch keine Transaktionen auf deinem Konto.", "receiverDeleted": "Das Empfängerkonto wurde gelöscht", "receiverNotFound": "Empfänger nicht gefunden", @@ -259,5 +204,5 @@ "transaction-link": { "button": "einlösen", "send_you": "sendet dir" - }, + } } diff --git a/frontend/src/locales/en.json b/frontend/src/locales/en.json index d396e57f2..6ea995b13 100644 --- a/frontend/src/locales/en.json +++ b/frontend/src/locales/en.json @@ -3,54 +3,29 @@ "back": "Back", "community": { "choose-another-community": "Choose another community", - "communities": { - "form": { - "date_period": "Date / Period", - "hours": "hours", - "hours_report": "Hourly report", - "more_hours": "more hours", - "submit": "Submit" - } - }, "community": "Community", "continue-to-registration": "Continue to registration", "current-community": "Current community", - "location": "Location:", "other-communities": "Other communities", "switch-to-this-community": "Switch to this community" }, + "dash": "—", "decay": { "before_startblock_transaction": "This transaction does not include decay.", "calculation_decay": "Calculation of Decay", "calculation_total": "Calculation of the total Amount", - "created": "Created", - "days": "Days", "decay": "Decay", - "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", "last_transaction": "Last transaction:", - "minutes": "Minutes", - "months": "Months", - "noDecay": "No Decay", "past_time": "Time passed", - "receive": "Received", - "seconds": "Seconds", - "send": "Sent", - "since_introduction": "Since the introduction of Decay", "Starting_block_decay": "Starting Block Decay", - "toCommunity": "To the community", - "total": "Total", - "year": "Years" + "total": "Total" }, "error": { - "change-password": "Error while changing password", "empty-transactionlist": "There was an error with the transmission of the number of your transactions.", "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." }, @@ -110,6 +85,7 @@ }, "your_amount": "Your amount" }, + "GDD": "GDD", "gdd_per_link": { "copy": "copy", "created": "Link was created!", @@ -117,14 +93,9 @@ "header": "Send Gradidos via link", "link-copied": "Link copied to clipboard", "not-copied": "Could not copy link: {err}", - "sentence_1": "Select an amount that you would like to send via link. You can also enter a message. Click 'Generate now' to create a link that you can share.", - "sentence_2": "The link is valid for 14 days!", - "sentence_3": "If the link is not redeemed within the 14-day validity period, it will be invalidated automatically. The amount will then be available to your account again.", - "sentence_4": "Whoever activates the link will receive the payment from your account. If the recipient is not yet a member of Gradido, he will be guided through the registration process and will get the GDD amount credited after registration / confirmation of the newly created Gradido account.", - "sentence_5": "The decay amount will be blocked for your account for the whole duration of the link. However, you will only be charged the amount of decay for the time which has actually passed until the link is redeemed. The remaining amount will then be available to your account again." + "sentence_1": "Select an amount that you would like to send via link. You can also enter a message. Click 'Generate now' to create a link that you can share." }, "gdt": { - "action": "Action", "calculation": "Calculation of GradidoTransform", "contribution": "Contribution", "conversion": "Conversion", @@ -146,20 +117,18 @@ "aprox": "~", "div": "/", "equal": "=", - "pipe": "|", - "exclaim": "!" + "exclaim": "!", + "pipe": "|" }, - "dash": "—", - "message": "hello gradido !!", "navigation": { "admin_area": "Admin Area", - "my-profil": "My profile", - "support": "Support", - "overview": "Overview", - "transactions": "Transactions", - "send": "Send", "logout": "Logout", - "members_area": "Members area" + "members_area": "Members area", + "my-profil": "My profile", + "overview": "Overview", + "send": "Send", + "support": "Support", + "transactions": "Transactions" }, "publisher": { "infoText": "If your referrer has given you his publisher id, enter it here, otherwise leave the field unchanged!", @@ -177,7 +146,6 @@ "changeLanguage": "Change language", "de": "Deutsch", "en": "English", - "select_language": "Please choose your language.", "success": "Your language has been successfully updated." }, "name": { @@ -191,37 +159,15 @@ }, "password": { "change-password": "Change password", - "forgot_pwd": "Forgot password?", - "not-authenticated": "Unfortunately we could not authenticate you. Please contact the support.", - "resend_subtitle": "Your activation link has expired, here you can order a new one.", - "reset": "Reset password", - "reset-password": { - "text": "Enter a new password that you will use to log in to your Gradido account in the future.." - }, - "send_now": "Send now", - "set": "Set password", - "set-password": { - "text": "Now save your new password, which you can use to log in to your Gradido account in the future." - }, - "subtitle": "If you have forgotten your password, you can reset it here." + "forgot_pwd": "Forgot password?" } }, "signup": "Sign up", "site": { - "404": { - "back": "Back to the overview", - "ooops": "Ooops!", - "text": "Page not found. But don't worry, we have many other sites to explore." - }, - "checkEmail": { - "errorText": "Could not verify the email.", - "title": "Verifing email" - }, "login": { "community": "A thousand thanks for being with us!", "heading": "Gradido", - "new_wallet": "Create new account", - "signin": "Sign in" + "new_wallet": "Create new account" }, "signup": { "agree": "I agree to the privacy policy.", @@ -250,7 +196,6 @@ "transaction": { "gdd-text": "Gradido Transactions", "gdt-text": "GradidoTransform Transactions", - "more": "more", "nullTransactions": "You don't have any transactions on your account yet.", "receiverDeleted": "The recipient account was deleted", "receiverNotFound": "Recipient not found",