encrypt/gancio
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

set instance_timezone before

Browse Source
This commit is contained in:
lesion
2022-08-05 18:08:03 +02:00
parent 3c59e8cc66
commit e0342b0dd7
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
server/helpers.js
View File

@@ -3,6 +3,8 @@ const settingsController = require('./api/controller/settings')
const acceptLanguage = require('accept-language') const acceptLanguage = require('accept-language')
const express = require('express') const express = require('express')
const dayjs = require('dayjs') const dayjs = require('dayjs')
const timezone = require('dayjs/plugin/timezone')
dayjs.extend(timezone)
const config = require('./config') const config = require('./config')
const log = require('./log') const log = require('./log')
@@ -81,6 +83,7 @@ module.exports = {
res.locals.settings.version = pkg.version res.locals.settings.version = pkg.version
// set user locale // set user locale
res.locals.user_locale = settingsController.user_locale[res.locals.acceptedLocale] res.locals.user_locale = settingsController.user_locale[res.locals.acceptedLocale]
dayjs.tz.setDefault(res.locals.settings.instance_timezone)
next() next()
}, },

1
store/index.js
View File

@@ -41,7 +41,6 @@ export const actions = {
// we use it to get configuration from db, set locale, etc... // we use it to get configuration from db, set locale, etc...
nuxtServerInit ({ commit }, { _req, res }) { nuxtServerInit ({ commit }, { _req, res }) {
commit('setSettings', res.locals.settings) commit('setSettings', res.locals.settings)
dayjs.tz(res.locals.settings.instance_timezone)
if (res.locals.status === 'READY') { if (res.locals.status === 'READY') {
commit('setAnnouncements', res.locals.announcements) commit('setAnnouncements', res.locals.announcements)
} }