Merge branch 'locale-reset' into 'develop'

Ensure selected locale is not reset to browser default when refreshing app

See merge request funkwhale/funkwhale!879

changes/changelog.d/locale.bugfix

@@ -0,0 +1 @@
+Ensure selected locale is not reset to browser default when refreshing app

front/src/App.vue

@@ -71,7 +71,9 @@ export default {
   created () {
     this.openWebsocket()
     let self = this
-    this.autodetectLanguage()
+    if (!this.$store.state.ui.selectedLanguage) {
+      this.autodetectLanguage()
+    }
     setInterval(() => {
       // used to redraw ago dates every minute
       self.$store.commit('ui/computeLastDate')

front/src/store/index.js

@@ -40,7 +40,7 @@ export default new Vuex.Store({
     }),
     createPersistedState({
       key: 'ui',
-      paths: ['ui.currentLanguage', 'ui.momentLocale', 'ui.theme']
+      paths: ['ui.currentLanguage', 'ui.selectedLanguage', 'ui.momentLocale', 'ui.theme']
     }),
     createPersistedState({
       key: 'radios',

front/src/store/ui.js

@@ -5,6 +5,7 @@ export default {
   namespaced: true,
   state: {
     currentLanguage: 'en_US',
+    selectedLanguage: false,
     momentLocale: 'en',
     lastDate: new Date(),
     maxMessages: 100,
@@ -33,6 +34,7 @@ export default {
     },
     currentLanguage: (state, value) => {
       state.currentLanguage = value
+      state.selectedLanguage = true
     },
     momentLocale: (state, value) => {
       state.momentLocale = value