Merge branch 'dev' into mrjvs-progress-github-links

src/routers/home.js

@@ -6,14 +6,18 @@ const router = new Router();
 const { getTrelloCache } = require('../trello');
 
 router.get('/', async (request, response) => {
-	const tmpLocale = util.getLocale('US', 'en');
+
+	const reqLocale = request.locale
+	const locale = util.getLocale(reqLocale.region, reqLocale.language);
+	
 	const cache = await getTrelloCache();
 
 	response.render('home', {
 		layout: 'main',
-		locale: tmpLocale,
 		featuredFeatureList: cache.sections[0],
 		boards,
+		locale,
+		localeString: reqLocale.toString(),
 	});
 });
 

src/routers/progress.js

@@ -6,14 +6,20 @@ const router = new Router();
 const { getTrelloCache } = require('../trello');
 
 router.get('/', async (request, response) => {
-	const tmpLocale = util.getLocale('US', 'en');
+
+	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',
-		locale: tmpLocale,
-		progressLists: cache,
 		boards,
+		locale,
+		localeString,
+		progressLists: cache
 	});
 });
 

src/server.js

@@ -3,6 +3,8 @@ process.title = 'Pretendo - Website';
 const express = require('express');
 const handlebars = require('express-handlebars');
 const morgan = require('morgan');
+const expressLocale = require('express-locale');
+const cookieParser = require('cookie-parser')
 const logger = require('./logger');
 const util = require('./util');
 const config = require('../config.json');
@@ -23,6 +25,28 @@ const routers = {
 	progress: require('./routers/progress')
 };
 
+app.use(cookieParser())
+
+// Locale express middleware setup
+app.use(expressLocale({
+	"priority": ["cookie", "accept-language", "map", "default"],
+	cookie: {name: 'preferredLocale'},
+	// fallbacks for browsers that don't send a region code, but only a language
+	map: {
+		de: 'de-DE',
+		es: 'es-ES',
+		fr: 'fr-FR',
+		it: 'it-IT',
+		ko: 'ko-KR',
+		ru: 'ru-RU',
+		tr: 'tr-TR'
+	},
+	"default": "en-US"
+}))
+
+
+
+
 app.use('/', routers.home);
 app.use('/faq', routers.faq);
 app.use('/progress', routers.progress);

src/trello.js

@@ -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');