Sprach- und Stadt-Wechsel geht wieder
This commit is contained in:
+20
-15
@@ -1,5 +1,5 @@
|
||||
import express from 'express'
|
||||
import pkg from '../package.json' assert { type: "json" }
|
||||
import pkg from '../package.json' assert { type: "json" }
|
||||
import { setLanguage } from '../charts/utilities.js'
|
||||
|
||||
const router = express.Router()
|
||||
@@ -7,15 +7,15 @@ const { name, version, date } = pkg
|
||||
|
||||
const renderOpts = (sid, cat) => {
|
||||
let tit = 'Feinstaub'
|
||||
if(cat === 'multigeiger') {
|
||||
if (cat === 'multigeiger') {
|
||||
tit = 'Geiger'
|
||||
} else if (cat == 'noise') {
|
||||
} else if (cat == 'noise') {
|
||||
tit = 'Noise'
|
||||
}
|
||||
return {
|
||||
title: tit,
|
||||
version: version,
|
||||
date: date.slice(0,10),
|
||||
date: date.slice(0, 10),
|
||||
csensor: sid,
|
||||
category: cat
|
||||
}
|
||||
@@ -28,7 +28,7 @@ const translate = (x) => {
|
||||
}
|
||||
|
||||
const getIndex = (cat) => {
|
||||
if (cat == 'noise'){
|
||||
if (cat == 'noise') {
|
||||
return 'index_noise'
|
||||
} else if (cat === 'multigeiger') {
|
||||
return 'index_geiger'
|
||||
@@ -39,10 +39,10 @@ const getIndex = (cat) => {
|
||||
/* GET home page. If there is no parameter 'lng=xx', check stored language and call
|
||||
te page again with correct language (chglang.js))
|
||||
*/
|
||||
router.get('/', function(req, res, next) {
|
||||
// req.i18n.changeLanguage('de')
|
||||
if(req.query.lng === undefined) {
|
||||
res.render('chglang')
|
||||
router.get('/', function (req, res, next) {
|
||||
// req.i18n.changeLanguage('de')
|
||||
if (req.query.lng === undefined) {
|
||||
res.render('chglang', {sensorid: ''})
|
||||
} else {
|
||||
i18n = req.i18n
|
||||
let opts = renderOpts(-1, req.app.get('category'))
|
||||
@@ -58,17 +58,22 @@ router.get('/', function(req, res, next) {
|
||||
// })
|
||||
|
||||
|
||||
router.get('/:sid', async function(req, res, next) {
|
||||
router.get('/:sid', async function (req, res, next) {
|
||||
const sid = req.params.sid
|
||||
let opts
|
||||
if(isNaN(sid)) {
|
||||
opts = renderOpts(-1, req.app.get('category'))
|
||||
if (req.query.lng === undefined) {
|
||||
res.render('chglang', { sensorid: sid })
|
||||
} else {
|
||||
opts = renderOpts(sid, req.app.get('category'))
|
||||
i18n = req.i18n
|
||||
if (isNaN(sid)) {
|
||||
opts = renderOpts(-1, req.app.get('category'))
|
||||
} else {
|
||||
opts = renderOpts(sid, req.app.get('category'))
|
||||
}
|
||||
res.render(getIndex(opts.category), opts)
|
||||
}
|
||||
res.render(getIndex(opts.category), opts)
|
||||
})
|
||||
|
||||
//export default router
|
||||
|
||||
export { router, translate }
|
||||
export { router, translate }
|
||||
Reference in New Issue
Block a user