fix: UI localization on load + update all namespaced locales

server/controllers/common.js

@@ -34,6 +34,8 @@ router.get('/healthz', (req, res, next) => {
 router.get(['/e', '/e/*'], async (req, res, next) => {
   const pageArgs = pageHelper.parsePath(req.path, { stripExt: true })
 
+  _.set(res, 'locals.siteConfig.lang', pageArgs.locale)
+
   if (pageHelper.isReservedPath(pageArgs.path)) {
     return next(new Error('Cannot create this page because it starts with a system reserved path.'))
   }
@@ -95,6 +97,8 @@ router.get(['/p', '/p/*'], (req, res, next) => {
 router.get(['/h', '/h/*'], async (req, res, next) => {
   const pageArgs = pageHelper.parsePath(req.path, { stripExt: true })
 
+  _.set(res, 'locals.siteConfig.lang', pageArgs.locale)
+
   if (!WIKI.auth.checkAccess(req.user, ['read:pages'], pageArgs)) {
     _.set(res.locals, 'pageMeta.title', 'Unauthorized')
     return res.render('unauthorized', { action: 'history' })
@@ -121,6 +125,8 @@ router.get(['/h', '/h/*'], async (req, res, next) => {
 router.get(['/s', '/s/*'], async (req, res, next) => {
   const pageArgs = pageHelper.parsePath(req.path, { stripExt: true })
 
+  _.set(res, 'locals.siteConfig.lang', pageArgs.locale)
+
   if (!WIKI.auth.checkAccess(req.user, ['read:pages'], pageArgs)) {
     return res.render('unauthorized', { action: 'source' })
   }
@@ -160,6 +166,9 @@ router.get('/*', async (req, res, next) => {
       userId: req.user.id,
       isPrivate: false
     })
+
+    _.set(res, 'locals.siteConfig.lang', pageArgs.locale)
+
     if (page) {
       _.set(res.locals, 'pageMeta.title', page.title)
       _.set(res.locals, 'pageMeta.description', page.description)

server/jobs/sync-graph-locales.js

@@ -29,39 +29,45 @@ module.exports = async () => {
     })
     const locales = _.sortBy(_.get(respList, 'data.localization.locales', []), 'name').map(lc => ({...lc, isInstalled: (lc.code === 'en')}))
     WIKI.cache.set('locales', locales)
-    const currentLocale = _.find(locales, ['code', WIKI.config.lang.code])
 
     // -> Download locale strings
 
     if (WIKI.config.lang.autoUpdate) {
-      const respStrings = await apollo({
-        query: `query ($code: String!) {
-          localization {
-            strings(code: $code) {
-              key
-              value
-            }
-          }
-        }`,
-        variables: {
-          code: WIKI.config.lang.code
-        }
-      })
-      const strings = _.get(respStrings, 'data.localization.strings', [])
-      let lcObj = {}
-      _.forEach(strings, row => {
-        if (_.includes(row.key, '::')) { return }
-        if (_.isEmpty(row.value)) { row.value = row.key }
-        _.set(lcObj, row.key.replace(':', '.'), row.value)
-      })
+      const activeLocales = WIKI.config.lang.namespacing ? WIKI.config.lang.namespaces : [WIKI.config.lang.code]
+      for (const currentLocale of activeLocales) {
+        const localeInfo = _.find(locales, ['code', currentLocale])
 
-      await WIKI.models.locales.query().update({
-        code: WIKI.config.lang.code,
-        strings: lcObj,
-        isRTL: currentLocale.isRTL,
-        name: currentLocale.name,
-        nativeName: currentLocale.nativeName
-      }).where('code', WIKI.config.lang.code)
+        const respStrings = await apollo({
+          query: `query ($code: String!) {
+            localization {
+              strings(code: $code) {
+                key
+                value
+              }
+            }
+          }`,
+          variables: {
+            code: currentLocale
+          }
+        })
+        const strings = _.get(respStrings, 'data.localization.strings', [])
+        let lcObj = {}
+        _.forEach(strings, row => {
+          if (_.includes(row.key, '::')) { return }
+          if (_.isEmpty(row.value)) { row.value = row.key }
+          _.set(lcObj, row.key.replace(':', '.'), row.value)
+        })
+
+        await WIKI.models.locales.query().update({
+          code: currentLocale,
+          strings: lcObj,
+          isRTL: localeInfo.isRTL,
+          name: localeInfo.name,
+          nativeName: localeInfo.nativeName
+        }).where('code', currentLocale)
+
+        WIKI.logger.info(`Pulled latest locale updates for ${localeInfo.name} from Graph endpoint: [ COMPLETED ]`)
+      }
     }
 
     await WIKI.lang.refreshNamespaces()