summaryrefslogtreecommitdiffstats
path: root/src/components/Properties/PropertyDateTime.vue
diff options
context:
space:
mode:
authorJohn Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>2018-09-07 16:07:18 +0200
committerJohn Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>2018-09-07 16:07:18 +0200
commit3e74f4e65d9b756b8a938d4aa24f252332c37a6f (patch)
tree904239dd60cdaeb1b90aa1c44412ae627e19406d /src/components/Properties/PropertyDateTime.vue
parentcab8558b211cf06859852037cc675e7e4e358d50 (diff)
Reload locale after dynamic fetch
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
Diffstat (limited to 'src/components/Properties/PropertyDateTime.vue')
-rw-r--r--src/components/Properties/PropertyDateTime.vue22
1 files changed, 13 insertions, 9 deletions
diff --git a/src/components/Properties/PropertyDateTime.vue b/src/components/Properties/PropertyDateTime.vue
index 686c037a..28e4625d 100644
--- a/src/components/Properties/PropertyDateTime.vue
+++ b/src/components/Properties/PropertyDateTime.vue
@@ -113,8 +113,7 @@ export default {
: 'time',
// locale and lang data
- // convert format like en_GB to en-gb for `moment.js`
- locale: OC.getLocale().replace('_', '-').toLowerCase(),
+ locale: 'en', // temporary value, see mounted
firstDay: window.firstDay, // provided by nextcloud
lang: {
days: window.dayNamesShort, // provided by nextcloud
@@ -169,20 +168,25 @@ export default {
mounted() {
// Load the locale
+ // convert format like en_GB to en-gb for `moment.js`
+ let locale = OC.getLocale().replace('_', '-').toLowerCase()
+
// default load e.g. fr-fr
- import('moment/locale/' + this.locale).catch(e => {
+ import('moment/locale/' + this.locale)
+ .then(e => {
+ this.locale = locale
+ })
+ .catch(e => {
// failure: fallback to fr
- console.debug(e)
- import('moment/locale/' + this.locale.split('-')[0])
+ import('moment/locale/' + locale.split('-')[0])
.then(e => {
- this.locale = this.locale.split('-')[0]
+ this.locale = locale.split('-')[0]
})
.catch(e => {
- // failure, fallback to english
- console.debug(e)
+ // failure, fallback to english
this.locale = 'en'
})
- })
+ })
},
methods: {