Skip to content
Snippets Groups Projects
Commit 7d56e97f authored by Eliot Berriot's avatar Eliot Berriot
Browse files

Merge branch '644-translation' into 'develop'

Fix #644: Initial UI render using correct language from browser

Closes #644

See merge request funkwhale/funkwhale!507
parents a4fcf9e8 5f1dabc5
Branches master
No related tags found
No related merge requests found
Initial UI render using correct language from browser (#644)
......@@ -51,6 +51,7 @@
</template>
<script>
import Vue from 'vue'
import axios from 'axios'
import _ from '@/lodash'
import {mapState} from 'vuex'
......@@ -133,6 +134,8 @@ export default {
autodetectLanguage () {
let userLanguage = navigator.language || navigator.userLanguage
let available = locales.locales.map(e => { return e.code })
let self = this
let candidate
let matching = available.filter((a) => {
return userLanguage.replace('-', '_') === a
})
......@@ -140,10 +143,20 @@ export default {
return userLanguage.replace('-', '_').split('_')[0] === a.split('_')[0]
})
if (matching.length > 0) {
this.$language.current = matching[0]
candidate = matching[0]
} else if (almostMatching.length > 0) {
this.$language.current = almostMatching[0]
candidate = almostMatching[0]
} else {
return
}
import(`./translations/${candidate}.json`).then((response) =>{
Vue.$translations[candidate] = response.default[candidate]
}).finally(() => {
// set current language twice, otherwise we seem to have a cache somewhere
// and rendering does not happen
self.$language.current = 'noop'
self.$language.current = candidate
})
},
disconnect () {
if (!this.bridge) {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment