Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-10-26 16:46:12 +01:00
Code Issues Packages Projects Releases Wiki Activity

feat: introduce overridable l10nBaseUrl config value

Browse Source
This commit is contained in:
Julian Lam
2020-08-06 10:44:41 -04:00
parent 9846498df7
commit def16f9e97
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2,7 +2,7 @@
(function (factory) { (function (factory) {
function loadClient(language, namespace) { function loadClient(language, namespace) {
return Promise.resolve(jQuery.getJSON(config.relative_path + '/assets/language/' + language + '/' + namespace + '.json?' + config['cache-buster'])); return Promise.resolve(jQuery.getJSON(config.l10nBaseUrl + '/' + language + '/' + namespace + '.json?' + config['cache-buster']));
} }
var warn = function () { console.warn.apply(console, arguments); }; var warn = function () { console.warn.apply(console, arguments); };
if (typeof define === 'function' && define.amd) { if (typeof define === 'function' && define.amd) {

3
src/controllers/api.js
View File

@@ -19,7 +19,8 @@ apiController.loadConfig = async function (req) {
let config = { let config = {
relative_path: nconf.get('relative_path'), relative_path: nconf.get('relative_path'),
upload_url: nconf.get('upload_url'), upload_url: nconf.get('upload_url'),
requireBaseUrl: nconf.get('relative_path') + '/assets/src/modules', requireBaseUrl: `${nconf.get('relative_path')}/assets/src/modules`,
l10nBaseUrl: `${nconf.get('relative_path')}/assets/language`,
siteTitle: validator.escape(String(meta.config.title || meta.config.browserTitle || 'NodeBB')), siteTitle: validator.escape(String(meta.config.title || meta.config.browserTitle || 'NodeBB')),
browserTitle: validator.escape(String(meta.config.browserTitle || meta.config.title || 'NodeBB')), browserTitle: validator.escape(String(meta.config.browserTitle || meta.config.title || 'NodeBB')),
titleLayout: (meta.config.titleLayout || '{pageTitle} | {browserTitle}').replace(/{/g, '{').replace(/}/g, '}'), titleLayout: (meta.config.titleLayout || '{pageTitle} | {browserTitle}').replace(/{/g, '{').replace(/}/g, '}'),