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

fix: timeago locale switch

Browse Source
This commit is contained in:
Barış Soner Uşaklı
2020-10-10 22:26:48 -04:00
parent 300a87559f
commit 8c019a6a3b
2 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -92,10 +92,7 @@ define('forum/account/settings', ['forum/account/header', 'components', 'transla
htmlEl.css('direction', translated); htmlEl.css('direction', translated);
}); });
var stringsModule = 'timeago/locales/jquery.timeago.' + utils.userLangToTimeagoCode(config.userLang); translator.switchTimeagoLanguage(utils.userLangToTimeagoCode(config.userLang), function () {
// without undef, requirejs won't load the strings a second time
require.undef(stringsModule);
require([stringsModule], function () {
overrides.overrideTimeago(); overrides.overrideTimeago();
ajaxify.refresh(); ajaxify.refresh();
}); });

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

@@ -605,7 +605,7 @@
} }
var originalSettings = assign({}, jQuery.timeago.settings.strings); var originalSettings = assign({}, jQuery.timeago.settings.strings);
jQuery.getScript(config.assetBaseUrl + '/vendor/jquery/timeago/locales/jquery.timeago.' + languageCode + '-short.js').done(function () { adaptor.switchTimeagoLanguage(languageCode + '-short', function () {
adaptor.timeagoShort = assign({}, jQuery.timeago.settings.strings); adaptor.timeagoShort = assign({}, jQuery.timeago.settings.strings);
jQuery.timeago.settings.strings = assign({}, originalSettings); jQuery.timeago.settings.strings = assign({}, originalSettings);
toggle(); toggle();
@@ -615,12 +615,16 @@
} }
}, },
switchTimeagoLanguage: function switchTimeagoLanguage(callback) { switchTimeagoLanguage: function switchTimeagoLanguage(langCode, callback) {
// Delete the cached shorthand strings if present // Delete the cached shorthand strings if present
delete adaptor.timeagoShort; delete adaptor.timeagoShort;
var languageCode = utils.userLangToTimeagoCode(config.userLang); var stringsModule = 'timeago/locales/jquery.timeago.' + langCode;
jQuery.getScript(config.assetBaseUrl + '/vendor/jquery/timeago/locales/jquery.timeago.' + languageCode + '.js').done(callback); // without undef, requirejs won't load the strings a second time
require.undef(stringsModule);
require([stringsModule], function () {
callback();
});
}, },
prepareDOM: function prepareDOM() { prepareDOM: function prepareDOM() {