From c45be5f39bad28cbe279bb390b939d61dc068eb4 Mon Sep 17 00:00:00 2001 From: Grzegorz Leoniec Date: Thu, 10 Jan 2019 15:32:54 +0100 Subject: [PATCH] Fixed i18n on SSR --- plugins/i18n.js | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/plugins/i18n.js b/plugins/i18n.js index 345aa3641..549ae722b 100644 --- a/plugins/i18n.js +++ b/plugins/i18n.js @@ -67,9 +67,12 @@ export default ({ app, req, cookie, store }) => { if (!isEmpty(localeCookie)) { userLocale = localeCookie } else { - userLocale = process.browser - ? navigator.language || navigator.userLanguage - : req.locale + try { + userLocale = process.browser + ? navigator.language || navigator.userLanguage + : req.headers['accept-language'].split(',')[0] + } catch (err) {} + if (userLocale && !isEmpty(userLocale.language)) { userLocale = userLocale.language.substr(0, 2) }