mirror of
https://github.com/NodeBB/NodeBB.git
synced 2026-07-07 22:03:24 +02:00
closes #444
This commit is contained in:
@@ -30,6 +30,7 @@
|
||||
languageFile = parsedKey[0];
|
||||
|
||||
parsedKey = parsedKey[1];
|
||||
|
||||
translator.load(languageFile, function (languageData) {
|
||||
if (callback) {
|
||||
callback(languageData[parsedKey]);
|
||||
@@ -39,6 +40,20 @@
|
||||
});
|
||||
};
|
||||
|
||||
translator.mget = function (keys, callback) {
|
||||
|
||||
var async = require('async');
|
||||
|
||||
function getKey(key, callback) {
|
||||
translator.get(key, function(value) {
|
||||
callback(null, value);
|
||||
});
|
||||
}
|
||||
|
||||
async.map(keys, getKey, callback);
|
||||
}
|
||||
|
||||
|
||||
/*
|
||||
* TODO: Not fully converted to server side yet, ideally server should be able to parse whole templates on demand if necessary
|
||||
* fix: translator.load should determine if server side and immediately return appropriate language file.
|
||||
|
||||
@@ -8,17 +8,15 @@ var RDB = require('./redis.js'),
|
||||
|
||||
Favourites.favourite = function (pid, room_id, uid, socket) {
|
||||
if (uid === 0) {
|
||||
var not_logged_in = {
|
||||
message: translator.get('topic:favourites.not_logged_in.message'),
|
||||
title: translator.get('topic:favourites.not_logged_in.title')
|
||||
};
|
||||
|
||||
socket.emit('event:alert', {
|
||||
alert_id: 'post_favourite',
|
||||
title: not_logged_in.title,
|
||||
message: not_logged_in.message,
|
||||
type: 'danger',
|
||||
timeout: 5000
|
||||
translator.mget(['topic:favourites.not_logged_in.message', 'topic:favourites.not_logged_in.title'], function(err, results) {
|
||||
socket.emit('event:alert', {
|
||||
alert_id: 'post_favourite',
|
||||
title: results[1],
|
||||
message: results[0],
|
||||
type: 'danger',
|
||||
timeout: 5000
|
||||
});
|
||||
});
|
||||
return;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user