From e3cfab8bb4abd0eb7aedc18eca8f4d788781c0bf Mon Sep 17 00:00:00 2001
From: Bat <baptiste@gelez.xyz>
Date: Fri, 13 Apr 2018 14:01:23 +0100
Subject: [PATCH] Language detection
---
front/package.json | 1 -
front/src/App.vue | 2 +-
front/src/main.js | 4 ++--
front/yarn.lock | 14 +++++++-------
4 files changed, 10 insertions(+), 11 deletions(-)
diff --git a/front/package.json b/front/package.json
index 01d396d01..e480008c6 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 705ed9cf3..bf9a1e261 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 99668bd1e..d22825191 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 fe92caab2..5e2064bda 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"
--
GitLab