diff --git a/package.json b/package.json index 150a26bb0..f95c040be 100644 --- a/package.json +++ b/package.json @@ -49,7 +49,7 @@ "vue-advanced-cropper": "2.8.1", "vue-drag-resize": "2.0.3", "vue-flatpickr-component": "9.0.6", - "vue-i18n": "9.2.0-beta.30", + "vue-i18n": "9.2.0-beta.35", "vue-router": "4.0.15", "vuex": "4.0.2", "workbox-precaching": "6.5.3", diff --git a/src/i18n/index.ts b/src/i18n/index.ts index 3570b5d57..bc28350bc 100644 --- a/src/i18n/index.ts +++ b/src/i18n/index.ts @@ -5,6 +5,7 @@ export const i18n = createI18n({ locale: 'en', // set locale fallbackLocale: 'en', globalInjection: true, + allowComposition: true, messages: { en: langEN, }, @@ -26,9 +27,9 @@ export const availableLanguages = { const loadedLanguages = ['en'] // our default language that is preloaded -const setI18nLanguage = lang => { +const setI18nLanguage = (lang: string) => { i18n.global.locale = lang - document.querySelector('html').setAttribute('lang', lang) + document.documentElement.lang =lang return lang } @@ -73,7 +74,7 @@ export const getCurrentLanguage = () => { return 'en' } -export const saveLanguage = lang => { +export const saveLanguage = (lang: string) => { localStorage.setItem('language', lang) setLanguage() } diff --git a/yarn.lock b/yarn.lock index a7c6daea6..6b9ea8074 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1182,43 +1182,43 @@ resolved "https://registry.yarnpkg.com/@humanwhocodes/object-schema/-/object-schema-1.2.1.tgz#b520529ec21d8e5945a1851dfd1c32e94e39ff45" integrity sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA== -"@intlify/core-base@9.2.0-beta.30": - version "9.2.0-beta.30" - resolved "https://registry.yarnpkg.com/@intlify/core-base/-/core-base-9.2.0-beta.30.tgz#82f86e3199661c18fbbd9b07ba58243909148384" - integrity sha512-tnOuI8gs4S7vv4WjG8oFL7vbZ4PM7Is/Ld3lRHQlBO7UjpnCVcQ94AgP/4F0cUPFn9JSPMQRN0aOOahW1BXvSA== +"@intlify/core-base@9.2.0-beta.35": + version "9.2.0-beta.35" + resolved "https://registry.yarnpkg.com/@intlify/core-base/-/core-base-9.2.0-beta.35.tgz#ef714d6ddf387024b1f1c0fcde0040a11bd33b0e" + integrity sha512-53yuCpo2ov5OKdvBTvE5zKMo2clLVqNORwkcY9TUu0B+yrOeDwLWQnbPJnOoDu5KkRdbdXlMxnHNCpJ5vlGZ1g== dependencies: - "@intlify/devtools-if" "9.2.0-beta.30" - "@intlify/message-compiler" "9.2.0-beta.30" - "@intlify/shared" "9.2.0-beta.30" - "@intlify/vue-devtools" "9.2.0-beta.30" + "@intlify/devtools-if" "9.2.0-beta.35" + "@intlify/message-compiler" "9.2.0-beta.35" + "@intlify/shared" "9.2.0-beta.35" + "@intlify/vue-devtools" "9.2.0-beta.35" -"@intlify/devtools-if@9.2.0-beta.30": - version "9.2.0-beta.30" - resolved "https://registry.yarnpkg.com/@intlify/devtools-if/-/devtools-if-9.2.0-beta.30.tgz#98b52ef802abe6ad29fd3d8486b9c8454469cf4f" - integrity sha512-3OxGFi6ooya9DFqX/JsxFjrj9nGYcDoo4CRGYSDqnC+xv4bnsyB5ekmaYBiVZtagCdZdSUMxbTFphl1WbtgNLQ== +"@intlify/devtools-if@9.2.0-beta.35": + version "9.2.0-beta.35" + resolved "https://registry.yarnpkg.com/@intlify/devtools-if/-/devtools-if-9.2.0-beta.35.tgz#16a8bb6b3f6d612ed705ab00a28eba8a8cb7b1ba" + integrity sha512-y3+7M+eS9mqeXTBa1QWAvt4nsjwWJ5G4xT+G3IFtd7Vb2CQHwli229n0avD+VdlDGwWCDWpLkny8QWtdNEYpOA== dependencies: - "@intlify/shared" "9.2.0-beta.30" + "@intlify/shared" "9.2.0-beta.35" -"@intlify/message-compiler@9.2.0-beta.30": - version "9.2.0-beta.30" - resolved "https://registry.yarnpkg.com/@intlify/message-compiler/-/message-compiler-9.2.0-beta.30.tgz#51955ebb388bc8774465e6e017a63bba1aeaed04" - integrity sha512-2kj/0nLIFrgiO86f9VifcUUcV8LdzXt4YYPIujx/LkTEQOuSFUo/bNiMaG1hyfiU/8mfq6tsaWKjoOZjeao1eQ== +"@intlify/message-compiler@9.2.0-beta.35": + version "9.2.0-beta.35" + resolved "https://registry.yarnpkg.com/@intlify/message-compiler/-/message-compiler-9.2.0-beta.35.tgz#3df3809650f4fef97d00ae739a87f33eb095bd79" + integrity sha512-wYQCgnRtyJ40HK3bJTrszHDaxqDXZH+9Ps7RsXNuNwZ9hIb1cVkLiUNIbuJS/XSJ1kATJXA6K+4if6ZLb0Ozxw== dependencies: - "@intlify/shared" "9.2.0-beta.30" + "@intlify/shared" "9.2.0-beta.35" source-map "0.6.1" -"@intlify/shared@9.2.0-beta.30": - version "9.2.0-beta.30" - resolved "https://registry.yarnpkg.com/@intlify/shared/-/shared-9.2.0-beta.30.tgz#623a2fcffdb063d5aa940f7236ab28a083c004c8" - integrity sha512-E1WHRTIlUEse3d/6t1pAagSXRxmeVeNIhx5kT80dfpYxw8lOnCWV9wLve2bq9Fkv+3TD2I5j+CdN7jvSl3LdsA== +"@intlify/shared@9.2.0-beta.35": + version "9.2.0-beta.35" + resolved "https://registry.yarnpkg.com/@intlify/shared/-/shared-9.2.0-beta.35.tgz#10f98403cb541d29d90d428a2ef58fbd927caf1d" + integrity sha512-DXf7xrwf08GKhr93XPQ8EgaEN0CIELl+mAS6SlRhi/aLtZv5HSGSMkz4M/ICwoWzFLSgOx/ZdBSasex19MMogg== -"@intlify/vue-devtools@9.2.0-beta.30": - version "9.2.0-beta.30" - resolved "https://registry.yarnpkg.com/@intlify/vue-devtools/-/vue-devtools-9.2.0-beta.30.tgz#6ef377067f59e170ae33c7018c9b4a6758da87b7" - integrity sha512-hcqDfwP/oXVmVCaJ0RA+uv1WSCcd42/Y13S0bySmWZv2KamLcxiD7wYxp/MaECG/D4KZcSLkq/wDHTG7lhYf5Q== +"@intlify/vue-devtools@9.2.0-beta.35": + version "9.2.0-beta.35" + resolved "https://registry.yarnpkg.com/@intlify/vue-devtools/-/vue-devtools-9.2.0-beta.35.tgz#209b5c4964a6dfc40ecc0497334f3fcc347b59d8" + integrity sha512-h7nf5F7AV4uKrr7zKTIyv8EOaIv4yAXuo7tvnFsp5uF8FO+kpBwWDm5csw9v9neyz42hiINJSP0Amou9M2ShEA== dependencies: - "@intlify/core-base" "9.2.0-beta.30" - "@intlify/shared" "9.2.0-beta.30" + "@intlify/core-base" "9.2.0-beta.35" + "@intlify/shared" "9.2.0-beta.35" "@jest/types@^25.5.0": version "25.5.0" @@ -12643,14 +12643,14 @@ vue-flatpickr-component@9.0.6: dependencies: flatpickr "^4.6.9" -vue-i18n@9.2.0-beta.30: - version "9.2.0-beta.30" - resolved "https://registry.yarnpkg.com/vue-i18n/-/vue-i18n-9.2.0-beta.30.tgz#e58effd4e1dcd328c3c40ad945aaf914146237c6" - integrity sha512-5DqrgG9ffgC7j3RRAfViC0WUcdz0C3Ix1qq1AyQItpF7UkSB6iSJGEjBG6KdspbRQq/8t1YzDx4JRXbL05l6ow== +vue-i18n@9.2.0-beta.35: + version "9.2.0-beta.35" + resolved "https://registry.yarnpkg.com/vue-i18n/-/vue-i18n-9.2.0-beta.35.tgz#9e5f18bcab8ca40db5c6fe8115bacea3e13cb981" + integrity sha512-kTYzZSB3B/ar3M9RfQ0KAyTGfvRw544qVzY++/sNV4stOKG6NxIDOdHdYTfVEXTSkczFwoZHTKXTWNVpx+GuHA== dependencies: - "@intlify/core-base" "9.2.0-beta.30" - "@intlify/shared" "9.2.0-beta.30" - "@intlify/vue-devtools" "9.2.0-beta.30" + "@intlify/core-base" "9.2.0-beta.35" + "@intlify/shared" "9.2.0-beta.35" + "@intlify/vue-devtools" "9.2.0-beta.35" "@vue/devtools-api" "^6.0.0-beta.13" vue-resize@^2.0.0-alpha.1: