greg6775/Hadder
1
0
Fork 0
Code Issues 9 Pull requests 5 Projects Releases 54 Packages Wiki Activity Actions

Merge Greg's branch into Hax's branch #228

Merged
greg6775 merged 21 commits from greg-dev into hax-dev 2019-12-21 18:10:28 +01:00
Conversation 0 Commits 21 Files changed 31 +4 -2
2 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 5be162fd1a - Show all commits

4
src/main/java/com/bbn/hadder/commands/fun/ClydeCommand.java
View file

@ -67,11 +67,11 @@ public class ClydeCommand implements Command {
@Override @Override
public String description() { public String description() {
return "Send a message as a Clyde webhook."; return "commands.fun.clyde.help.description";
} }
@Override @Override
public String usage() { public String usage() {
return "<Message-Content>"; return "content";
} }
} }

2
src/main/resources/Translations/Translations_en.properties
View file

@ -13,6 +13,7 @@ vc-name/id = <VoiceChannelID|VoiceChannelName>
user+nickname = <@user> <New Nickname> user+nickname = <@user> <New Nickname>
region = <region> region = <region>
guildid = <Guild-ID> guildid = <Guild-ID>
content = <Message-content>
error = Error error = Error
none = None none = None
@ -25,6 +26,7 @@ commands.fun.gif.help.description = Look for a GIF on Giphy
commands.fun.meme.success.title = Your random meme commands.fun.meme.success.title = Your random meme
commands.fun.meme.api.error = The request to the meme API could not be processed. Please try it again later. commands.fun.meme.api.error = The request to the meme API could not be processed. Please try it again later.
commands.fun.meme.help.description = Sends you a random meme. commands.fun.meme.help.description = Sends you a random meme.
commands.fun.clyde.help.description = Send a message as a webhook named Clyde.
commands.general.about.success.title = Hadder - About commands.general.about.success.title = Hadder - About
commands.general.about.success.description = Hadder is an open source Discord bot. commands.general.about.success.description = Hadder is an open source Discord bot.