yetangitu/funkwhale
1
0
Fork 0
mirror of https://code.eliotberriot.com/funkwhale/funkwhale.git synced 2025-10-04 03:19:16 +02:00
Code Issues Releases Wiki Activity

Fix #670: Use proper locale for date-related/duration strings

Browse source
This commit is contained in:
Eliot Berriot 2019-01-25 11:34:30 +01:00
parent e4cb036a97
commit 7d003282eb
No known key found for this signature in database
GPG key ID: DD6965E2476E5C27
7 changed files with 45 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

45
front/src/App.vue
View file

@ -57,11 +57,10 @@ import _ from '@/lodash'
import {mapState} from 'vuex'
import { WebSocketBridge } from 'django-channels'
import GlobalEvents from '@/components/utils/global-events'
import Sidebar from '@/components/Sidebar'
import AppFooter from '@/components/Footer'
import ServiceMessages from '@/components/ServiceMessages'
import moment from 'moment'
import locales from './locales'
import PlaylistModal from '@/components/playlists/PlaylistModal'
import ShortcutsModal from '@/components/ShortcutsModal'
@ -153,14 +152,7 @@ export default {
} 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
})
this.$store.commit('ui/currentLanguage', candidate)
},
disconnect () {
if (!this.bridge) {
@ -191,7 +183,7 @@ export default {
bridge.socket.addEventListener('open', function () {
console.log('Connected to WebSocket')
})
}
},
},
computed: {
...mapState({
@ -235,8 +227,35 @@ export default {
this.openWebsocket()
}
},
'$language.current' (newValue) {
this.$store.commit('ui/currentLanguage', newValue)
'$store.state.ui.currentLanguage': {
immediate: true,
handler(newValue) {
let self = this
import(`./translations/${newValue}.json`).then((response) =>{
Vue.$translations[newValue] = response.default[newValue]
}).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 = newValue
})
if (newValue === 'en_US') {
return self.$store.commit('ui/momentLocale', 'en')
}
let momentLocale = newValue.replace('_', '-').toLowerCase()
import(`moment/locale/${momentLocale}.js`).then(() => {
self.$store.commit('ui/momentLocale', momentLocale)
}).catch(() => {
console.log('No momentjs locale available for', momentLocale)
let shortLocale = momentLocale.split('-')[0]
import(`moment/locale/${shortLocale}.js`).then(() => {
self.$store.commit('ui/momentLocale', shortLocale)
}).catch(() => {
console.log('No momentjs locale available for', shortLocale)
})
})
console.log(moment.locales())
}
}
}
}