diff --git a/gulpfile.js b/gulpfile.js
index 27034c46..a20ccdf5 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -429,7 +429,7 @@ async function custompages() {
 			globalLanguage: config.get.language,
 		};
 	i18n.init(locals);
-	locals.setLocale(config.get.language);
+	locals.setLocale(locals, config.get.language);
 	return gulp.src([
 		`${paths.pug.src}/custompages/*.pug`,
 		`${paths.pug.src}/pages/404.pug`,
diff --git a/lib/build/render.js b/lib/build/render.js
index 1d7c972a..d8ad03d4 100644
--- a/lib/build/render.js
+++ b/lib/build/render.js
@@ -42,7 +42,7 @@ const updateLocals = () => {
 		globalLanguage: language,
 	};
 	i18n.init(renderLocals);
-	renderLocals.setLocale(language);
+	renderLocals.setLocale(renderLocals, language);
 };
 
 updateLocals();
@@ -59,9 +59,9 @@ module.exports = async (htmlName=null, templateName=null, options=null, json=nul
 		};
 		//NOTE: will this cause issues with global locale?
 		if (options.board && options.board.settings) {
-			renderLocals.setLocale(options.board.settings.language);
+			renderLocals.setLocale(renderLocals, options.board.settings.language);
 		} else {
-			renderLocals.setLocale(language);
+			renderLocals.setLocale(renderLocals, language);
 		}
 		html = pug.renderFile(`${templateDirectory}${templateName}`, mergedLocals);
 	}
diff --git a/lib/middleware/locale/locale.js b/lib/middleware/locale/locale.js
index 95366c96..27901e7a 100644
--- a/lib/middleware/locale/locale.js
+++ b/lib/middleware/locale/locale.js
@@ -8,14 +8,14 @@ module.exports = {
 	setGlobalLanguage: (req, res, next) => {
 		// global settings locale
 		const { language } = config.get;
-		i18n.setLocale(res.locals, language);
+		res.locals.setLocale(res.locals, language);
 		next();
 	},
 
 	setBoardLanguage: (req, res, next) => {
 		// board settings locale
 		const language = res.locals.board.settings.language;
-		i18n.setLocale(res.locals, language);
+		res.locals.setLocale(res.locals, language);
 		next();
 	},
 
diff --git a/server.js b/server.js
index bca16007..df51b631 100644
--- a/server.js
+++ b/server.js
@@ -93,7 +93,7 @@ const config = require(__dirname+'/lib/misc/config.js')
 		app.locals.captchaOptions = captchaOptions;
 		app.locals.globalLanguage = language;
 		i18n.init(app.locals);
-		app.locals.setLocale(language);
+		app.locals.setLocale(app.locals, language);
 	};
 	loadAppLocals();
 	redis.addCallback('config', loadAppLocals);