From 0e956f6c675bc94d428fa5fdeab28c064d3a70bc Mon Sep 17 00:00:00 2001 From: Robbie Antenesse Date: Sun, 20 Sep 2020 17:21:05 -0600 Subject: [PATCH] Make request.language default to 'en' Add i18n.pages.default using 'en' locale --- server/i18n/index.js | 1 + server/index.js | 4 +--- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/server/i18n/index.js b/server/i18n/index.js index 745e541..5c94330 100644 --- a/server/i18n/index.js +++ b/server/i18n/index.js @@ -36,6 +36,7 @@ async function plugin (fastify, opts, done) { // Set the default language to English after parsing locales because it has the most coverage. i18n.default = i18n.en; + i18n.pages.default = i18n.pages.en; } catch (ex) { console.error('Could not get locales folder.\n', ex); } diff --git a/server/index.js b/server/index.js index 8d8e49c..f51f008 100644 --- a/server/index.js +++ b/server/index.js @@ -100,9 +100,7 @@ fastify.addHook('onRequest', async (request, reply) => { request.user = user; } } - if (typeof request.cookies.lang !== 'undefined') { - request.language = request.cookies.lang; - } + request.language = typeof request.cookies.lang !== 'undefined' ? request.cookies.lang : 'en'; }); // Store i18n files in fastify object and register locales routes