This commit is contained in:
Monty
2021-09-13 15:26:08 +02:00
parent fe1e5d3163
commit 4b780ada13
8 changed files with 57 additions and 58 deletions

View File

@@ -7,7 +7,7 @@ const { getTrelloCache } = require('../trello');
router.get('/', async (request, response) => {
const reqLocale = request.locale
const reqLocale = request.locale;
const locale = util.getLocale(reqLocale.region, reqLocale.language);
const cache = await getTrelloCache();

View File

@@ -4,7 +4,7 @@ const router = new Router();
router.get('/', async (request, response) => {
const reqLocale = request.locale
const reqLocale = request.locale;
const locale = util.getLocale(reqLocale.region, reqLocale.language);
response.render('localization', {

View File

@@ -7,18 +7,16 @@ const { getTrelloCache } = require('../trello');
router.get('/', async (request, response) => {
const reqLocale = request.locale
const reqLocale = request.locale;
const locale = util.getLocale(reqLocale.region, reqLocale.language);
const localeString = reqLocale.toString()
const cache = await getTrelloCache();
response.render('progress', {
layout: 'main',
boards,
locale,
localeString,
localeString: reqLocale.toString(),
progressLists: cache
});
});

View File

@@ -4,7 +4,7 @@ const express = require('express');
const handlebars = require('express-handlebars');
const morgan = require('morgan');
const expressLocale = require('express-locale');
const cookieParser = require('cookie-parser')
const cookieParser = require('cookie-parser');
const logger = require('./logger');
const util = require('./util');
const config = require('../config.json');
@@ -26,11 +26,11 @@ const routers = {
localization: require('./routers/localization')
};
app.use(cookieParser())
app.use(cookieParser());
// Locale express middleware setup
app.use(expressLocale({
"priority": ['cookie', 'accept-language', 'map', 'default'],
'priority': ['cookie', 'accept-language', 'map', 'default'],
cookie: {name: 'preferredLocale'},
// Map unavailable regions to available locales from the same language
@@ -59,8 +59,8 @@ app.use(expressLocale({
'ru', 'ru-RU',
'tr', 'tr-TR',
],
"default": "en-US"
}))
'default': 'en-US'
}));
@@ -109,7 +109,7 @@ app.engine('handlebars', handlebars({
}));
app.set('view engine', 'handlebars');
logger.info('Starting server')
logger.info('Starting server');
app.listen(port, () => {
logger.success(`Server listening on *:${port}`);
});

View File

@@ -1,4 +1,4 @@
const Trello =require("trello")
const Trello =require('trello');
const Redis = require('ioredis');
const JSONCache = require('redis-json');
const config = require('../config.json');

View File

@@ -20,4 +20,4 @@ function getLocale(region, language) {
module.exports = {
fullUrl,
getLocale
}
};