Converted all of the other modules to the new translate syntax.

This commit is contained in:
Luke Slater 2012-05-19 16:48:01 +01:00
parent 42c4871a16
commit fa2d0b8465
3 changed files with 15 additions and 17 deletions

View File

@ -25,7 +25,7 @@ var adminCommands = function(dbot) {
child = exec("git pull", function (error, stdout, stderr) { child = exec("git pull", function (error, stdout, stderr) {
console.log(stderr); console.log(stderr);
dbot.say(data.channel, dbot.strings[dbot.language].gpull); dbot.say(data.channel, dbot.t('gpull'));
commands.reload(data, params); commands.reload(data, params);
}.bind(this)); }.bind(this));
}, },
@ -34,7 +34,7 @@ var adminCommands = function(dbot) {
dbot.db = JSON.parse(fs.readFileSync('db.json', 'utf-8')); dbot.db = JSON.parse(fs.readFileSync('db.json', 'utf-8'));
dbot.strings = JSON.parse(fs.readFileSync('strings.json', 'utf-8')); dbot.strings = JSON.parse(fs.readFileSync('strings.json', 'utf-8'));
dbot.reloadModules(); dbot.reloadModules();
dbot.say(data.channel, dbot.strings[dbot.language].reload); dbot.say(data.channel, dbot.t('reload'));
}, },
'say': function(data, params) { 'say': function(data, params) {
@ -60,7 +60,7 @@ var adminCommands = function(dbot) {
'load': function(data, params) { 'load': function(data, params) {
dbot.moduleNames.push(params[1]); dbot.moduleNames.push(params[1]);
dbot.reloadModules(); dbot.reloadModules();
dbot.say(data.channel, dbot.strings[dbot.language].load_module.format({'moduleName': params[1]})); dbot.say(data.channel, dbot.t('load_module', {'moduleName': params[1]}));
}, },
'unload': function(data, params) { 'unload': function(data, params) {
@ -72,9 +72,9 @@ var adminCommands = function(dbot) {
dbot.moduleNames.splice(moduleIndex, 1); dbot.moduleNames.splice(moduleIndex, 1);
dbot.reloadModules(); dbot.reloadModules();
dbot.say(data.channel, dbot.strings[dbot.language].unload_module.format({'moduleName': params[1]})); dbot.say(data.channel, dbot.t('unload_module', {'moduleName': params[1]}));
} else { } else {
dbot.say(data.channel, dbot.strings[dbot.language].unload_error.format({'moduleName': params[1]})); dbot.say(data.channel, dbot.t('unload_error', {'moduleName': params[1]}));
} }
}, },
@ -84,31 +84,31 @@ var adminCommands = function(dbot) {
} else { } else {
dbot.db.bans[params[2]] = [ params[1] ]; dbot.db.bans[params[2]] = [ params[1] ];
} }
dbot.say(data.channel, dbot.strings[dbot.language].banned.format({'user': params[1], 'command': params[2]})); dbot.say(data.channel, dbot.t('banned', {'user': params[1], 'command': params[2]}));
}, },
'unban': function(data, params) { 'unban': function(data, params) {
if(dbot.db.bans.hasOwnProperty(params[2]) && dbot.db.bans[params[2]].include(params[1])) { if(dbot.db.bans.hasOwnProperty(params[2]) && dbot.db.bans[params[2]].include(params[1])) {
dbot.db.bans[params[2]].splice(dbot.db.bans[params[2]].indexOf(params[1]), 1); dbot.db.bans[params[2]].splice(dbot.db.bans[params[2]].indexOf(params[1]), 1);
dbot.say(data.channel, dbot.strings[dbot.language].unbanned.format({'user': params[1], 'command': params[2]})); dbot.say(data.channel, dbot.t('unbanned', {'user': params[1], 'command': params[2]}));
} else { } else {
dbot.say(data.channel, dbot.strings[dbot.language].unban_error.format({'user': params[1]})); dbot.say(data.channel, dbot.t('unban_error', {'user': params[1]}));
} }
}, },
'modehate': function(data, params) { 'modehate': function(data, params) {
dbot.db.modehate.push(params[1]); dbot.db.modehate.push(params[1]);
dbot.say(data.channel, dbot.strings[dbot.language].modehate.format({'user': params[1]})); dbot.say(data.channel, dbot.t('modehate', {'user': params[1]}));
}, },
'unmodehate': function(data, params) { 'unmodehate': function(data, params) {
dbot.db.modehate.splice(dbot.db.modehate.indexOf(params[1]), 1); dbot.db.modehate.splice(dbot.db.modehate.indexOf(params[1]), 1);
dbot.say(data.channel, dbot.strings[dbot.language].unmodehate.format({'user': params[1]})); dbot.say(data.channel, dbot.t('unmodehate', {'user': params[1]}));
}, },
'lock': function(data, params) { 'lock': function(data, params) {
dbot.db.locks.push(params[1]); dbot.db.locks.push(params[1]);
dbot.say(data.channel, dbot.strings[dbot.language].qlock.format({'category': params[1]})); dbot.say(data.channel, dbot.t('qlock', {'category': params[1]}));
} }
}; };

View File

@ -79,8 +79,7 @@ var command = function(dbot) {
if(dbot.commands.hasOwnProperty(params[0])) { if(dbot.commands.hasOwnProperty(params[0])) {
if((dbot.db.bans.hasOwnProperty(params[0]) && if((dbot.db.bans.hasOwnProperty(params[0]) &&
dbot.db.bans[params[0]].include(data.user)) || dbot.db.bans['*'].include(data.user)) { dbot.db.bans[params[0]].include(data.user)) || dbot.db.bans['*'].include(data.user)) {
dbot.say(data.channel, data.user + dbot.say(data.channel, dbot.t('command_ban', {'user': data.user}));
' is banned from using this command. Commence incineration.');
} else { } else {
var commandBelongsTo = dbot.commandMap[params[0]]; var commandBelongsTo = dbot.commandMap[params[0]];
if(dbot.db.ignores.hasOwnProperty(data.user) && if(dbot.db.ignores.hasOwnProperty(data.user) &&
@ -95,8 +94,7 @@ var command = function(dbot) {
var q = data.message.valMatch(/^~([\d\w\s-]*)/, 2); var q = data.message.valMatch(/^~([\d\w\s-]*)/, 2);
if(q) { if(q) {
if(dbot.db.bans['*'].include(data.user)) { if(dbot.db.bans['*'].include(data.user)) {
dbot.say(data.channel, data.user + dbot.say(data.channel, dbot.t('command_ban', {'user': data.user}));
' is banned from using this command. Commence incineration.');
} else { } else {
q[1] = q[1].trim(); q[1] = q[1].trim();
key = dbot.cleanNick(q[1]) key = dbot.cleanNick(q[1])

View File

@ -45,11 +45,11 @@ var spelling = function(dbot) {
var otherQ = data.message.valMatch(/^([\d\w\s]*): (?:\*\*?([\d\w\s']*)|([\d\w\s']*)\*\*?)$/, 4); var otherQ = data.message.valMatch(/^([\d\w\s]*): (?:\*\*?([\d\w\s']*)|([\d\w\s']*)\*\*?)$/, 4);
if(q) { if(q) {
correct(data, q[1] || q[2], data.user, function (e) { correct(data, q[1] || q[2], data.user, function (e) {
dbot.say(data.channel, dbot.strings[dbot.language].spelling_self.format(e)); dbot.say(data.channel, dbot.t('spelling_self', e));
}); });
} else if(otherQ) { } else if(otherQ) {
correct(data, otherQ[2] || otherQ[3], otherQ[1], function (e) { correct(data, otherQ[2] || otherQ[3], otherQ[1], function (e) {
dbot.say(data.channel, dbot.strings[dbot.language].spelling_other.format(e)); dbot.say(data.channel, dbot.t('spelling_other', e));
}); });
} else { } else {
if(last.hasOwnProperty(data.channel)) { if(last.hasOwnProperty(data.channel)) {