diff --git a/front/package.json b/front/package.json index 01d396d01229a97fe3a4c1f819143cd8cb19478c..e480008c6742ca501148b36028bf6d879fa80776 100644 --- a/front/package.json +++ b/front/package.json @@ -20,7 +20,6 @@ "dateformat": "^2.0.0", "django-channels": "^1.1.6", "i18next": "^11.1.1", - "i18next-browser-languagedetector": "^2.2.0", "i18next-conv": "^6.0.0", "i18next-fetch-backend": "^0.1.0", "js-logger": "^1.3.0", diff --git a/front/src/App.vue b/front/src/App.vue index 705ed9cf366c82530661a76028ddbcc2c44d1e8c..bf9a1e26108750e7d5f2609f0c65e9ecdfdc81fc 100644 --- a/front/src/App.vue +++ b/front/src/App.vue @@ -50,7 +50,7 @@ export default { PlaylistModal }, created () { - this.$i18n.i18next.changeLanguage('fr') + // this.$i18n.i18next.changeLanguage('fr') console.log(this.$t('Hello, world!')) this.$store.dispatch('instance/fetchSettings') let self = this diff --git a/front/src/main.js b/front/src/main.js index 99668bd1ea9a77fffeb0ad56e409e620989ee6a2..d22825191863edbc7a217652a7ec727ef50a6c41 100644 --- a/front/src/main.js +++ b/front/src/main.js @@ -86,9 +86,9 @@ store.dispatch('auth/check') i18next .use(i18nextFetch) .init({ - lng: 'en', + lng: navigator.language, fallbackLng: ['en'], - preload: ['en'], + preload: [navigator.language, 'en'], backend: { loadPath: '/static/translations/{{lng}}.json' } diff --git a/front/yarn.lock b/front/yarn.lock index fe92caab20ecffc62a19d2aa67018a8e9611ab85..5e2064bdaef2573844916b042939bfdc3b2ea307 100644 --- a/front/yarn.lock +++ b/front/yarn.lock @@ -6469,9 +6469,9 @@ showdown@^1.8.6: dependencies: yargs "^10.0.3" -shvl@^1.2.0: - version "1.2.1" - resolved "https://registry.yarnpkg.com/shvl/-/shvl-1.2.1.tgz#7ea96257475b20cb69d2a58897c0640c93973593" +shvl@^1.3.0: + version "1.3.1" + resolved "https://registry.yarnpkg.com/shvl/-/shvl-1.3.1.tgz#6c20a17b4a20b08e9f8cab60c50a92229fcc176e" sigmund@^1.0.1: version "1.0.1" @@ -7359,12 +7359,12 @@ vuedraggable@^2.14.1: dependencies: sortablejs "^1.7.0" -vuex-persistedstate@^2.4.2: - version "2.5.1" - resolved "https://registry.yarnpkg.com/vuex-persistedstate/-/vuex-persistedstate-2.5.1.tgz#129274514e2e46b49e8ca8066cf85b345c7b4ce2" +vuex-persistedstate@^2.5.2: + version "2.5.2" + resolved "https://registry.yarnpkg.com/vuex-persistedstate/-/vuex-persistedstate-2.5.2.tgz#751752f03bdf6d7fc855106f0666f2ce13b415b5" dependencies: deepmerge "^2.1.0" - shvl "^1.2.0" + shvl "^1.3.0" vuex-router-sync@^5.0.0: version "5.0.0"