Moved getLocale to util.js

src/routers/progress.js

@@ -1,11 +1,11 @@
-const getLocale = require('../../util/getLocale');
 const { Router } = require('express');
+const util = require('../util');
 const router = new Router();
 
 const { getTrelloCache } = require('../../util/trello');
 
 router.get('/', async (request, response) => {
-	const tmpLocale = getLocale('US', 'en');
+	const tmpLocale = util.getLocale('US', 'en');
 	const cache = await getTrelloCache();
 
 	response.render('progress', {

src/util.js

@@ -1,7 +1,23 @@
+const fs = require('fs-extra');
+const logger = require('./logger');
+
 function fullUrl(request) {
 	return `${request.protocol}://${request.hostname}${request.originalUrl}`;
 }
 
+function getLocale(region, language) {
+	const path = `${__dirname}/../locales/${region}_${language}.json`;
+
+	if (fs.pathExistsSync(path)) {
+		return require(path);
+	}
+
+	logger.warn(`Could not find locale ${region}_${language}! Loading US_en`);
+
+	return require(`${__dirname}/../locales/US_en.json`);
+}
+
 module.exports = {
-	fullUrl
+	fullUrl,
+	getLocale
 }

util/getLocale.js

@@ -1,8 +0,0 @@
-module.exports = (variant, language) => {
-	try {
-		return require(`../locales/${variant}_${language}.json`);
-	} catch(e) {
-		// Use US_en as a fallback
-		return require('../locales/US_en.json');
-	}
-};