Merge branch 'vue3-refactoring-staging' into develop

Reviewed-by: pacien <pacien.trangirard@pacien.net>

1 files changed, 8 insertions, 11 deletions

diff --git a/viewer/src/plugins/i18n.ts b/viewer/src/plugins/i18n.ts
index bc3dde5..c377250 100644
--- a/viewer/src/plugins/i18n.ts
+++ b/viewer/src/plugins/i18n.ts
@@ -1,7 +1,7 @@
 /* ldgallery - A static generator which turns a collection of tagged
 --             pictures into a searchable web gallery.
 --
--- Copyright (C) 2019-2020  Guillaume FOUET
+-- Copyright (C) 2019-2022  Guillaume FOUET
 --
 -- This program is free software: you can redistribute it and/or modify
 -- it under the terms of the GNU Affero General Public License as
@@ -17,14 +17,11 @@
 -- along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-import Vue from "vue";
-import VueI18n, { LocaleMessages } from "vue-i18n";
+import { createI18n, LocaleMessages, VueMessageType } from 'vue-i18n';
 
-Vue.use(VueI18n);
-
-function loadLocaleMessages(): LocaleMessages {
-  const locales = require.context("@/locales", true, /[A-Za-z0-9-_,\s]+\.json$/i);
-  const messages: LocaleMessages = {};
+function loadLocaleMessages(): LocaleMessages<VueMessageType> {
+  const locales = require.context('../locales', false, /[A-Za-z0-9-_,\s]+\.yml$/i);
+  const messages: LocaleMessages<VueMessageType> = {};
   locales.keys().forEach(key => {
     const matched = key.match(/([A-Za-z0-9-_]+)\./i);
     if (matched && matched.length > 1) {
@@ -35,8 +32,8 @@ function loadLocaleMessages(): LocaleMessages {
   return messages;
 }
 
-export default new VueI18n({
-  locale: process.env.VUE_APP_I18N_LOCALE || "en",
-  fallbackLocale: process.env.VUE_APP_I18N_FALLBACK_LOCALE || "en",
+export default createI18n({
+  locale: process.env.VUE_APP_I18N_LOCALE || 'en',
+  fallbackLocale: process.env.VUE_APP_I18N_FALLBACK_LOCALE || 'en',
   messages: loadLocaleMessages(),
 });