diff --git a/src/routers/progress.js b/src/routers/progress.js index c5ac56e..a9facd8 100644 --- a/src/routers/progress.js +++ b/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', { diff --git a/src/util.js b/src/util.js index 7835f06..bd5433e 100644 --- a/src/util.js +++ b/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 } \ No newline at end of file diff --git a/util/getLocale.js b/util/getLocale.js deleted file mode 100644 index fb14f72..0000000 --- a/util/getLocale.js +++ /dev/null @@ -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'); - } -}; \ No newline at end of file