Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-11-05 05:25:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

Switch to assets route

Browse Source
This commit is contained in:
Peter Jaszkowiak
2017-01-14 16:27:35 -07:00
parent b4b3be3d97
commit e1a29f4aa8
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
public/src/modules/translator.js
View File

@@ -3,7 +3,7 @@
(function (factory) { (function (factory) {
'use strict'; 'use strict';
function loadClient(language, namespace) { 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 () {}; var warn = function () {};
if (typeof config === 'object' && config.environment === 'development') { if (typeof config === 'object' && config.environment === 'development') {

7
src/routes/index.js
View File

@@ -4,6 +4,7 @@ var nconf = require('nconf');
var winston = require('winston'); var winston = require('winston');
var path = require('path'); var path = require('path');
var async = require('async'); var async = require('async');
var meta = require('../meta');
var controllers = require('../controllers'); var controllers = require('../controllers');
var plugins = require('../plugins'); var plugins = require('../plugins');
var user = require('../user'); var user = require('../user');
@@ -144,15 +145,15 @@ module.exports = function (app, middleware, hotswapIds) {
} }
app.use(middleware.privateUploads); 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 maxAge: app.enabled('cache') ? 5184000000 : 0
})); }));
// DEPRECATED // DEPRECATED
app.use(relativePath + '/api/language', function (req, res) { app.use(relativePath + '/api/language', function (req, res) {
winston.warn('[deprecated] Accessing language files from `/api/language` is deprecated. ' + winston.warn('[deprecated] Accessing language files from `/api/language` is deprecated. ' +
'Use `/public/language/[langCode]/[namespace].json` for prefetch paths.'); 'Use `/assets/language/[langCode]/[namespace].json` for prefetch paths.');
res.redirect(relativePath + '/public/language' + req.path + '.json'); res.redirect(relativePath + '/assets/language' + req.path + '.json?' + meta.config['cache-buster']);
}); });
app.use(relativePath, express.static(path.join(__dirname, '../../', 'public'), { app.use(relativePath, express.static(path.join(__dirname, '../../', 'public'), {