From e1a29f4aa8c56c895592dac45b31051ea6e6853d Mon Sep 17 00:00:00 2001
From: Peter Jaszkowiak <p.jaszkow@gmail.com>
Date: Sat, 14 Jan 2017 16:27:35 -0700
Subject: [PATCH] Switch to `assets` route

---
 public/src/modules/translator.js | 2 +-
 src/routes/index.js              | 7 ++++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/public/src/modules/translator.js b/public/src/modules/translator.js
index a146a94eeb..eac467f413 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?' + config['cache-buster']));
+		return Promise.resolve(jQuery.getJSON(config.relative_path + '/assets/language/' + language + '/' + namespace + '.json?' + config['cache-buster']));
 	}
 	var warn = function () {};
 	if (typeof config === 'object' && config.environment === 'development') {
diff --git a/src/routes/index.js b/src/routes/index.js
index c4d61ed4ec..158774b624 100644
--- a/src/routes/index.js
+++ b/src/routes/index.js
@@ -4,6 +4,7 @@ var nconf = require('nconf');
 var winston = require('winston');
 var path = require('path');
 var async = require('async');
+var meta = require('../meta');
 var controllers = require('../controllers');
 var plugins = require('../plugins');
 var user = require('../user');
@@ -144,15 +145,15 @@ module.exports = function (app, middleware, hotswapIds) {
 	}
 
 	app.use(middleware.privateUploads);
-	app.use(relativePath + '/public', express.static(path.join(__dirname, '../../', 'build/public'), {
+	app.use(relativePath + '/assets', express.static(path.join(__dirname, '../../', 'build/public'), {
 		maxAge: app.enabled('cache') ? 5184000000 : 0
 	}));
 
 	// DEPRECATED
 	app.use(relativePath + '/api/language', function (req, res) {
 		winston.warn('[deprecated] Accessing language files from `/api/language` is deprecated. ' + 
-			'Use `/public/language/[langCode]/[namespace].json` for prefetch paths.');
-		res.redirect(relativePath + '/public/language' + req.path + '.json');
+			'Use `/assets/language/[langCode]/[namespace].json` for prefetch paths.');
+		res.redirect(relativePath + '/assets/language' + req.path + '.json?' + meta.config['cache-buster']);
 	});
 
 	app.use(relativePath, express.static(path.join(__dirname, '../../', 'public'), {