From b4b3be3d976d4918eab0e92c51e221b390f7ff8b Mon Sep 17 00:00:00 2001
From: Peter Jaszkowiak <p.jaszkow@gmail.com>
Date: Fri, 13 Jan 2017 21:12:20 -0700
Subject: [PATCH] Cache bust translations, query param name

---
 public/src/modules/translator.js | 2 +-
 public/src/require-config.js     | 2 +-
 src/meta/configs.js              | 2 +-
 src/routes/index.js              | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/public/src/modules/translator.js b/public/src/modules/translator.js
index 1e71d579e7..a146a94eeb 100644
--- a/public/src/modules/translator.js
+++ b/public/src/modules/translator.js
@@ -3,7 +3,7 @@
 (function (factory) {
 	'use strict';
 	function loadClient(language, namespace) {
-		return Promise.resolve(jQuery.getJSON(config.relative_path + '/public/language/' + language + '/' + namespace + '.json'));
+		return Promise.resolve(jQuery.getJSON(config.relative_path + '/public/language/' + language + '/' + namespace + '.json?' + config['cache-buster']));
 	}
 	var warn = function () {};
 	if (typeof config === 'object' && config.environment === 'development') {
diff --git a/public/src/require-config.js b/public/src/require-config.js
index 0ad2f8a58c..8618685052 100644
--- a/public/src/require-config.js
+++ b/public/src/require-config.js
@@ -1,7 +1,7 @@
 require.config({
 	baseUrl: config.relative_path + "/src/modules",
 	waitSeconds: 7,
-	urlArgs: "v=" + config['cache-buster'],
+	urlArgs: config['cache-buster'],
 	paths: {
 		'forum': '../client',
 		'admin': '../admin',
diff --git a/src/meta/configs.js b/src/meta/configs.js
index 0ad2bf2545..75da0595d2 100644
--- a/src/meta/configs.js
+++ b/src/meta/configs.js
@@ -21,7 +21,7 @@ module.exports = function (Meta) {
 				Meta.configs.list(next);
 			},
 			function (config, next) {
-				config['cache-buster'] = utils.generateUUID();
+				config['cache-buster'] = 'v=' + utils.generateUUID();
 
 				Meta.config = config;
 				setImmediate(next);
diff --git a/src/routes/index.js b/src/routes/index.js
index ea86434570..c4d61ed4ec 100644
--- a/src/routes/index.js
+++ b/src/routes/index.js
@@ -144,7 +144,7 @@ module.exports = function (app, middleware, hotswapIds) {
 	}
 
 	app.use(middleware.privateUploads);
-	app.use(relativePath + '/public/language', express.static(path.join(__dirname, '../../', 'build/public/language'), {
+	app.use(relativePath + '/public', express.static(path.join(__dirname, '../../', 'build/public'), {
 		maxAge: app.enabled('cache') ? 5184000000 : 0
 	}));