For the 100th time, make it "work"

indiachan-spamvector
Thomas Lynch 1 year ago
parent 670119148c
commit a019006e20
  1. 2
      gulpfile.js
  2. 6
      lib/build/render.js
  3. 4
      lib/middleware/locale/locale.js
  4. 2
      server.js

@ -429,7 +429,7 @@ async function custompages() {
globalLanguage: config.get.language, globalLanguage: config.get.language,
}; };
i18n.init(locals); i18n.init(locals);
locals.setLocale(config.get.language); locals.setLocale(locals, config.get.language);
return gulp.src([ return gulp.src([
`${paths.pug.src}/custompages/*.pug`, `${paths.pug.src}/custompages/*.pug`,
`${paths.pug.src}/pages/404.pug`, `${paths.pug.src}/pages/404.pug`,

@ -42,7 +42,7 @@ const updateLocals = () => {
globalLanguage: language, globalLanguage: language,
}; };
i18n.init(renderLocals); i18n.init(renderLocals);
renderLocals.setLocale(language); renderLocals.setLocale(renderLocals, language);
}; };
updateLocals(); updateLocals();
@ -59,9 +59,9 @@ module.exports = async (htmlName=null, templateName=null, options=null, json=nul
}; };
//NOTE: will this cause issues with global locale? //NOTE: will this cause issues with global locale?
if (options.board && options.board.settings) { if (options.board && options.board.settings) {
renderLocals.setLocale(options.board.settings.language); renderLocals.setLocale(renderLocals, options.board.settings.language);
} else { } else {
renderLocals.setLocale(language); renderLocals.setLocale(renderLocals, language);
} }
html = pug.renderFile(`${templateDirectory}${templateName}`, mergedLocals); html = pug.renderFile(`${templateDirectory}${templateName}`, mergedLocals);
} }

@ -8,14 +8,14 @@ module.exports = {
setGlobalLanguage: (req, res, next) => { setGlobalLanguage: (req, res, next) => {
// global settings locale // global settings locale
const { language } = config.get; const { language } = config.get;
i18n.setLocale(res.locals, language); res.locals.setLocale(res.locals, language);
next(); next();
}, },
setBoardLanguage: (req, res, next) => { setBoardLanguage: (req, res, next) => {
// board settings locale // board settings locale
const language = res.locals.board.settings.language; const language = res.locals.board.settings.language;
i18n.setLocale(res.locals, language); res.locals.setLocale(res.locals, language);
next(); next();
}, },

@ -93,7 +93,7 @@ const config = require(__dirname+'/lib/misc/config.js')
app.locals.captchaOptions = captchaOptions; app.locals.captchaOptions = captchaOptions;
app.locals.globalLanguage = language; app.locals.globalLanguage = language;
i18n.init(app.locals); i18n.init(app.locals);
app.locals.setLocale(language); app.locals.setLocale(app.locals, language);
}; };
loadAppLocals(); loadAppLocals();
redis.addCallback('config', loadAppLocals); redis.addCallback('config', loadAppLocals);

Loading…
Cancel
Save