From b1c8a1c37690262a86a92c88ebca6cb3d32e95f0 Mon Sep 17 00:00:00 2001 From: Sam Date: Sat, 24 Jun 2023 19:14:02 +0200 Subject: [PATCH] API & Client - enable pl translations --- fittrackee/config.py | 2 +- fittrackee_client/package.json | 1 + fittrackee_client/src/i18n.ts | 7 +------ fittrackee_client/src/utils/dates.ts | 2 +- fittrackee_client/src/utils/locales.ts | 10 +++++----- fittrackee_client/src/utils/password.ts | 15 +++++++-------- fittrackee_client/yarn.lock | 5 +++++ 7 files changed, 21 insertions(+), 21 deletions(-) diff --git a/fittrackee/config.py b/fittrackee/config.py index 2562792b..8720036f 100644 --- a/fittrackee/config.py +++ b/fittrackee/config.py @@ -66,7 +66,7 @@ class BaseConfig: 'nl', 'es', 'gl', - # 'pl', # disabled for now + 'pl', ] OAUTH2_TOKEN_EXPIRES_IN = { 'authorization_code': 864000, # 10 days diff --git a/fittrackee_client/package.json b/fittrackee_client/package.json index 8cdceae5..257f66c6 100644 --- a/fittrackee_client/package.json +++ b/fittrackee_client/package.json @@ -20,6 +20,7 @@ "@zxcvbn-ts/language-es-es": "^3.0.1", "@zxcvbn-ts/language-fr": "^3.0.1", "@zxcvbn-ts/language-it": "^3.0.1", + "@zxcvbn-ts/language-pl": "^3.0.1", "axios": "^1.4.0", "chart.js": "^4.3.0", "chartjs-plugin-datalabels": "^2.2.0", diff --git a/fittrackee_client/src/i18n.ts b/fittrackee_client/src/i18n.ts index 5ec3aedb..52dfc0ca 100644 --- a/fittrackee_client/src/i18n.ts +++ b/fittrackee_client/src/i18n.ts @@ -6,18 +6,13 @@ import { createI18n, LocaleMessages, VueMessageType } from 'vue-i18n' * The loaded `JSON` locale messages is pre-compiled by `@intlify/vue-i18n-loader`, which is integrated into `vue-cli-plugin-i18n`. * See: https://github.com/intlify/vue-i18n-loader#rocket-i18n-resource-pre-compilation */ -const disabledLanguages = ['pl'] // to update after translations release function loadLocaleMessages(): Record> { const locales = require.context('./locales', true, /[A-Za-z0-9-_,\s]+\.ts$/i) const messages: Record> = {} locales.keys().forEach((key) => { const matched = key.match(/([A-Za-z0-9-_]+)\./i) - if ( - matched && - matched.length > 1 && - !disabledLanguages.includes(matched[1]) - ) { + if (matched && matched.length > 1) { const locale = matched[1] messages[locale] = locales(key).default } diff --git a/fittrackee_client/src/utils/dates.ts b/fittrackee_client/src/utils/dates.ts index f948448f..d97aa3e5 100644 --- a/fittrackee_client/src/utils/dates.ts +++ b/fittrackee_client/src/utils/dates.ts @@ -100,7 +100,7 @@ export const dateStringFormats: Record = { fr: 'd MMM yyyy', gl: 'd MMM yyyy', it: 'd MMM yyyy', - // pl: 'd MMM yyyy', // disabled for now + pl: 'd MMM yyyy', nb: 'do MMM yyyy', nl: 'd MMM yyyy', } diff --git a/fittrackee_client/src/utils/locales.ts b/fittrackee_client/src/utils/locales.ts index c0ef77dd..f853378e 100644 --- a/fittrackee_client/src/utils/locales.ts +++ b/fittrackee_client/src/utils/locales.ts @@ -1,6 +1,6 @@ /* eslint-disable import/no-duplicates */ import { Locale } from 'date-fns' -import { de, enUS, es, fr, gl, it, nb, nl } from 'date-fns/locale' +import { de, enUS, es, fr, gl, it, nb, nl, pl } from 'date-fns/locale' import createI18n from '@/i18n' @@ -11,7 +11,7 @@ export const localeFromLanguage: Record = { fr: fr, gl: gl, it: it, - // pl: pl, + pl: pl, nb: nb, nl: nl, } @@ -22,10 +22,10 @@ export const languageLabels: Record = { es: 'Español', fr: 'Français', gl: 'Galego', - it: 'Italiano', - // pl: 'Polski', - nb: 'Norsk bokmål', + it: 'Italiano (87%)', + nb: 'Norsk bokmål (36%)', nl: 'Nederlands', + pl: 'Polski (43%)', } const { availableLocales } = createI18n.global diff --git a/fittrackee_client/src/utils/password.ts b/fittrackee_client/src/utils/password.ts index 2bbed1bf..1abf0fe1 100644 --- a/fittrackee_client/src/utils/password.ts +++ b/fittrackee_client/src/utils/password.ts @@ -2,9 +2,9 @@ import { zxcvbnOptions } from '@zxcvbn-ts/core' export const loadLanguagePackage = async (language: string) => { // no package available for - // - dutch (Nederlands) - // - galician - // - norwegian bokmal + // - Dutch (Nederlands) + // - Galician + // - Norwegian bokmal // fallback to english switch (language) { case 'fr': @@ -23,11 +23,10 @@ export const loadLanguagePackage = async (language: string) => { return await import( /* webpackChunkName: "password.es" */ '@zxcvbn-ts/language-es-es' ) - // TODO: add package - // case 'pl': - // return await import( - // /* webpackChunkName: "password.pl" */ '@zxcvbn-ts/language-pl' - // ) + case 'pl': + return await import( + /* webpackChunkName: "password.pl" */ '@zxcvbn-ts/language-pl' + ) default: return await import( /* webpackChunkName: "password.en" */ '@zxcvbn-ts/language-en' diff --git a/fittrackee_client/yarn.lock b/fittrackee_client/yarn.lock index e3bddf4e..64d44cf5 100644 --- a/fittrackee_client/yarn.lock +++ b/fittrackee_client/yarn.lock @@ -2298,6 +2298,11 @@ resolved "https://registry.yarnpkg.com/@zxcvbn-ts/language-it/-/language-it-3.0.1.tgz#3f6dfe8d4951f91c108ec00d941d1ce3b0053393" integrity sha512-ejuxUsame0+kR1mJStCrUFtuByFCLGU4sdW9ZvcbjQ7K1UrzMsfLNSmA48M5FoicdY79twyJw1YWSUFyJFmt+g== +"@zxcvbn-ts/language-pl@^3.0.1": + version "3.0.1" + resolved "https://registry.yarnpkg.com/@zxcvbn-ts/language-pl/-/language-pl-3.0.1.tgz#4658fe112045a51e2d96277725e546fbf4a04160" + integrity sha512-Sqc/u4b0q7rb6pYSQuf34HgdjIqo0Rd5aeouV9jJEUr6TDZl1l9yuj6YdAQy+ZAOMHz1e0lLnp930oY+xI6fGA== + abab@^2.0.5, abab@^2.0.6: version "2.0.6" resolved "https://registry.yarnpkg.com/abab/-/abab-2.0.6.tgz#41b80f2c871d19686216b82309231cfd3cb3d291"