Revert "feat: load timeago strings client-side"

This reverts commit 558a2d739c.
v1.18.x
Barış Soner Uşaklı 5 years ago
parent 558a2d739c
commit 3f01f4a2b8

@ -252,11 +252,7 @@ app.cacheBuster = null;
app.processPage = function () {
highlightNavigationLink();
app.initTimeago().then(function () {
$('.timeago').timeago();
}, function () {
console.warn('[timeago] Unable to retrieve ' + config.userLang + ' strings, falling back to English');
});
$('.timeago').timeago();
utils.makeNumbersHumanReadable($('.human-readable-number'));
@ -272,21 +268,6 @@ app.cacheBuster = null;
}
};
app.initTimeago = function () {
// Loads strings based on user language, if not already loaded
return new Promise(function (resolve, reject) {
if (app.flags._timeago) {
return resolve();
}
var pathToLocaleFile = '/vendor/jquery/timeago/locales/jquery.timeago.' + utils.userLangToTimeagoCode(config.userLang) + '.js';
$.getScript(config.assetBaseUrl + pathToLocaleFile).done(function () {
app.flags._timeago = true;
resolve();
}).fail(reject);
});
};
app.showMessages = function () {
var messages = {
login: {

@ -15,6 +15,7 @@ var plugins = require('../plugins');
var navigation = require('../navigation');
var translator = require('../translator');
var privileges = require('../privileges');
var languages = require('../languages');
var utils = require('../utils');
var helpers = require('./helpers');
@ -187,8 +188,25 @@ module.exports = function (middleware) {
templateValues: templateValues,
});
const scripts = await plugins.fireHook('filter:scripts.get', []);
data.templateValues.scripts = scripts.map(function (script) {
const results = await utils.promiseParallel({
scripts: plugins.fireHook('filter:scripts.get', []),
timeagoLocale: (async () => {
const languageCodes = await languages.listCodes();
const userLang = res.locals.config.userLang;
const timeagoCode = utils.userLangToTimeagoCode(userLang);
if (languageCodes.includes(userLang) && languages.timeagoCodes.includes(timeagoCode)) {
const pathToLocaleFile = '/vendor/jquery/timeago/locales/jquery.timeago.' + timeagoCode + '.js';
return nconf.get('relative_path') + '/assets' + pathToLocaleFile;
}
return false;
})(),
});
if (results.timeagoLocale) {
results.scripts.push(results.timeagoLocale);
}
data.templateValues.scripts = results.scripts.map(function (script) {
return { src: script };
});

Loading…
Cancel
Save