Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2026-03-06 04:21:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixes #3695

Browse Source 
Guests now trigger topic notifications, and the translator has
been updated so that translations inside translations are
handled in a way that doesn't cause the translator to explode.
This commit is contained in:
Julian Lam
2015-12-31 12:03:48 -05:00
parent 1660e13aed
commit fcb381f922
2 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -9,7 +9,7 @@
var languages = {},
regexes = {
match: /\[\[\w+:.*?\]\]/g,
match: /\[\[\w+:[^\[]*?\]\]/g,
split: /[,][\s]*/,
replace: /\]+$/
};
@@ -153,7 +153,12 @@
translateKey(key, data, language, function(translated) {
--count;
if (count <= 0) {
callback(translated.text);
keys = translated.text.match(regexes.match);
if (!keys) {
callback(translated.text);
} else {
translateKeys(keys, translated.text, language, callback);
}
}
});
});

2
src/topics/create.js
View File

@@ -252,10 +252,10 @@ module.exports = function(Topics) {
}
if (parseInt(uid, 10)) {
Topics.notifyFollowers(postData, uid);
user.setUserField(uid, 'lastonline', Date.now());
}
Topics.notifyFollowers(postData, uid);
plugins.fireHook('action:topic.reply', postData);
next(null, postData);