From 233d5565f6d4572b283d85d698de1822b3b6fc07 Mon Sep 17 00:00:00 2001 From: Corentin THOMASSET Date: Sun, 3 Sep 2023 22:07:45 +0200 Subject: [PATCH] refactor(i18n): merge tools scoped locales with global ones (#612) --- src/pages/Home.page.vue | 2 +- src/plugins/i18n.plugin.ts | 24 ++++++++++++++++++++---- vite.config.ts | 5 ++++- 3 files changed, 25 insertions(+), 6 deletions(-) diff --git a/src/pages/Home.page.vue b/src/pages/Home.page.vue index 49d90c67..5c7c3c4f 100644 --- a/src/pages/Home.page.vue +++ b/src/pages/Home.page.vue @@ -49,7 +49,7 @@ const { t } = useI18n();
- {{ t('home.categories.newestTools', 'Newest tools') }} + {{ t('home.categories.newestTools') }} diff --git a/src/plugins/i18n.plugin.ts b/src/plugins/i18n.plugin.ts index c38cdee1..8e0b2d33 100644 --- a/src/plugins/i18n.plugin.ts +++ b/src/plugins/i18n.plugin.ts @@ -1,6 +1,22 @@ -import type { App } from 'vue'; +import type { Plugin } from 'vue'; import { createI18n } from 'vue-i18n'; -import messages from '@intlify/unplugin-vue-i18n/messages'; +import baseMessages from '@intlify/unplugin-vue-i18n/messages'; +import _ from 'lodash'; +import { parse as parseYaml } from 'yaml'; + +const i18nFiles = import.meta.glob('../tools/*/locales/**.yml', { as: 'raw' }); + +const messagesByTools = await Promise.all(_.map(i18nFiles, async (fileDescriptor, path) => { + const [, locale] = path.match(/\.\/tools\/.*?\/locales\/(.*)\.ya?ml$/i) ?? []; + const content = parseYaml(await fileDescriptor()); + + return { [locale]: content }; +})); + +const messages = _.merge( + baseMessages, + _.merge({}, ...messagesByTools), +); const i18n = createI18n({ legacy: false, @@ -8,8 +24,8 @@ const i18n = createI18n({ messages, }); -export const i18nPlugin = { - install: (app: App) => { +export const i18nPlugin: Plugin = { + install: (app) => { app.use(i18n); }, }; diff --git a/vite.config.ts b/vite.config.ts index 8e2e0836..00f90c33 100644 --- a/vite.config.ts +++ b/vite.config.ts @@ -25,7 +25,7 @@ export default defineConfig({ runtimeOnly: true, compositionOnly: true, fullInstall: true, - include: [resolve(__dirname, 'locales/**'), resolve(__dirname, 'src/tools/*/locales/**')], + include: [resolve(__dirname, 'locales/**')], }), AutoImport({ imports: [ @@ -106,4 +106,7 @@ export default defineConfig({ test: { exclude: [...configDefaults.exclude, '**/*.e2e.spec.ts'], }, + build: { + target: 'esnext', + }, });