Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-10-31 02:55:58 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix: #7824, update timeago settings on userlanguage change

Browse Source
This commit is contained in:
Barış Soner Uşaklı
2019-09-08 21:44:22 -04:00
parent 429e124f34
commit 3887fc678b
2 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
public/src/client/account/settings.js
View File

@@ -81,11 +81,11 @@ define('forum/account/settings', ['forum/account/header', 'components', 'sounds'
} }
app.alertSuccess('[[success:settings-saved]]'); app.alertSuccess('[[success:settings-saved]]');
var requireReload = false; var languageChanged = false;
for (var key in newSettings) { for (var key in newSettings) {
if (newSettings.hasOwnProperty(key)) { if (newSettings.hasOwnProperty(key)) {
if (key === 'userLang' && config.userLang !== newSettings.userLang) { if (key === 'userLang' && config.userLang !== newSettings.userLang) {
requireReload = true; languageChanged = true;
} }
if (config.hasOwnProperty(key)) { if (config.hasOwnProperty(key)) {
config[key] = newSettings[key]; config[key] = newSettings[key];
@@ -95,13 +95,16 @@ define('forum/account/settings', ['forum/account/header', 'components', 'sounds'
sounds.loadMap(); sounds.loadMap();
if (requireReload && parseInt(app.user.uid, 10) === parseInt(ajaxify.data.theirid, 10)) { if (languageChanged && parseInt(app.user.uid, 10) === parseInt(ajaxify.data.theirid, 10)) {
translator.translate('[[language:dir]]', config.userLang, function (translated) { translator.translate('[[language:dir]]', config.userLang, function (translated) {
var htmlEl = $('html'); var htmlEl = $('html');
htmlEl.attr('data-dir', translated); htmlEl.attr('data-dir', translated);
htmlEl.css('direction', translated); htmlEl.css('direction', translated);
}); });
$.getScript(config.relative_path + '/assets/vendor/jquery/timeago/locales/jquery.timeago.' + utils.userLangToTimeagoCode(config.userLang) + '.js', function () {
overrides.overrideTimeago();
ajaxify.refresh(); ajaxify.refresh();
});
} }
}); });
} }

7
public/src/overrides.js
View File

@@ -108,9 +108,12 @@ if (typeof window !== 'undefined') {
} }
}); });
}()); }());
var timeagoFn;
overrides.overrideTimeago = function () { overrides.overrideTimeago = function () {
var timeagoFn = $.fn.timeago; if (!timeagoFn) {
timeagoFn = $.fn.timeago;
}
if (parseInt(config.timeagoCutoff, 10) === 0) { if (parseInt(config.timeagoCutoff, 10) === 0) {
$.timeago.settings.cutoff = 1; $.timeago.settings.cutoff = 1;
} else if (parseInt(config.timeagoCutoff, 10) > 0) { } else if (parseInt(config.timeagoCutoff, 10) > 0) {