GitHub/dbot
3
0
Fork 1
mirror of https://github.com/reality/dbot.git synced 2024-12-26 04:32:37 +01:00
Code Issues Projects Releases Wiki Activity

Merge pull request #313 from JohnMaguire2013/master

Browse Source 
refactored DBot.prototype.t to add new error case
This commit is contained in:
reality 2013-03-19 03:16:53 -07:00
commit ccef54fd2f
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/quotes/commands.js
View File

@ -199,7 +199,7 @@ var commands = function(dbot) {
'url': dbot.t('url', { 'url': dbot.t('url', {
'host': dbot.config.web.webHost, 'host': dbot.config.web.webHost,
'port': dbot.config.web.webPort, 'port': dbot.config.web.webPort,
'path': 'quotes/' + key 'path': 'quotes/' + encodeURIComponent(key)
}) })
})); }));
} else { } else {

9
run.js
View File

@ -86,16 +86,17 @@ DBot.prototype.say = function(server, channel, message) {
// Format given stored string in config language // Format given stored string in config language
DBot.prototype.t = function(string, formatData) { DBot.prototype.t = function(string, formatData) {
var formattedString; var formattedString = 'String not found. Something has gone screwy. Maybe.';
if(_.has(this.strings, string)) { if(_.has(this.strings, string)) {
var lang = this.config.language; var lang = this.config.language;
if(!_.has(this.strings[string], lang)) { if(!_.has(this.strings[string], lang)) {
lang = "en"; lang = "en";
} }
formattedString = this.strings[string][lang].format(formatData); if(_.has(this.strings[string], lang)) {
} else { formattedString = this.strings[string][lang].format(formatData);
formattedString = 'String not found. Something has gone screwy. Maybe.'; }
} }
return formattedString; return formattedString;