From 8b0c8657e8748fe99c98cc727b2c54ac7bba2e4c Mon Sep 17 00:00:00 2001 From: Alexander Drozdov Date: Tue, 12 Jan 2021 23:28:44 +0200 Subject: [PATCH] move --- src/{web => assets}/locales/en.json | 0 src/{web => assets}/locales/ru.json | 0 src/web/i18n.ts | 15 ++++++++------- 3 files changed, 8 insertions(+), 7 deletions(-) rename src/{web => assets}/locales/en.json (100%) rename src/{web => assets}/locales/ru.json (100%) diff --git a/src/web/locales/en.json b/src/assets/locales/en.json similarity index 100% rename from src/web/locales/en.json rename to src/assets/locales/en.json diff --git a/src/web/locales/ru.json b/src/assets/locales/ru.json similarity index 100% rename from src/web/locales/ru.json rename to src/assets/locales/ru.json diff --git a/src/web/i18n.ts b/src/web/i18n.ts index 292072e6..fce6c865 100644 --- a/src/web/i18n.ts +++ b/src/web/i18n.ts @@ -1,14 +1,15 @@ -import { createI18n, VueI18nOptions } from 'vue-i18n' +import { createI18n, I18nAdditionalOptions, ComposerOptions } from 'vue-i18n' import { Config } from './Config' -export default createI18n({ +export default createI18n({ + legacy: false, locale: Config.store.language, fallbackLocale: 'en', - formatFallbackMessages: true, - silentFallbackWarn: true, - silentTranslationWarn: true, + fallbackFormat: true, + fallbackWarn: false, + missingWarn: false, messages: { - en: require('./locales/en.json'), - ru: require('./locales/ru.json') + en: require('../assets/locales/en.json'), + ru: require('../assets/locales/ru.json') } })