Merge branch 'master' of github.com:reality/depressionbot

This commit is contained in:
reality 2013-04-14 03:54:00 +00:00
commit e99653076d
3 changed files with 9 additions and 6 deletions

View File

@ -20,7 +20,7 @@ var imgur = function(dbot) {
if(imgData.animated) {
info += 'an animated ' + imgData.type.split('/')[1] + ' with ';
} else {
info += 'a non-animated ' + imgData.type.split('/')[1] + ' with ';
info += 'a ' + imgData.type.split('/')[1] + ' with ';
}
} else {
info += 'an image with ';

View File

@ -69,7 +69,7 @@ var reddit = function(dbot) {
'up': info.ups,
'down': info.downs
});
if(info.over_18) infoString += ' [NSFW]';
if(info.over_18) infoString += " " + dbot.t("nsfw");
event.reply(infoString);
}
});
@ -85,7 +85,7 @@ var reddit = function(dbot) {
'down': info.downs,
'url': this.ApiRoot + matches[4]
});
if(info.over_18) infoString += ' [NSFW]';
if(info.over_18) infoString += " " + dbot.t("nsfw");
event.reply(infoString);
}
}.bind(this));
@ -97,7 +97,7 @@ var reddit = function(dbot) {
'subscribers': info.subscribers,
'active': info.accounts_active
});
if(info.over18) infoString += ' [NSFW]';
if(info.over18) infoString += dbot.t("nsfw");
event.reply(infoString);
}
});

View File

@ -3,9 +3,12 @@
"en": "[{display_name} has {subscribers} subscribers ({active} active)]"
},
"about_post": {
"en": "[Post by {poster} in {subreddit} - Comments: {comments}, Score: {score} ({up}|{down})] - {url}"
"en": "[Post by {poster} in {subreddit} — Comments: {comments}, Score: {score} (\u00039▲{up}\u000f|\u000312{down}▼\u000f)] — {url}"
},
"about_comment": {
"en": "[Comment by {poster} in {subreddit} - Score: {score} ({up}|{down})]"
"en": "[Comment by {poster} in {subreddit} — Score: {score} (\u00039▲{up}\u000f|\u000312{down}▼\u000f)]"
},
"nsfw": {
"en": "[NSFW]"
}
}