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

Joo #218

Merged
greg6775 merged 59 commits from master into hax-dev 2019-12-18 17:28:00 +01:00
Conversation 0 Commits 59 Files changed 33 +19 -7
3 changed files with 19 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 93e93f8f05 - Show all commits

8
src/main/java/com/bbn/hadder/commands/settings/LanguageCommand.java
View file

@ -44,8 +44,8 @@ public class LanguageCommand implements Command {
public void setLanguage(String language_code, String language , CommandEvent event) {
event.getRethink().setLanguage(event.getAuthor().getId(), language_code);
event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO)
.setTitle("Language set")
.setDescription(language + " is your new language now.")
.setTitle(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.settings.language.success.title"))
.setDescription(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.settings.language.success.description", language))
.build()).queue();
}
@ -56,11 +56,11 @@ public class LanguageCommand implements Command {
@Override
public String description() {
return "Sets the new primary language for a user.";
return MessageEditor.handle("en", "commands.settings.language.help.description");
}
@Override
public String usage() {
return "<Language code>";
return MessageEditor.handle("en", "commands.settings.language.help.usage");
}
}

9
src/main/java/com/bbn/hadder/commands/settings/PrefixCommand.java
View file

@ -14,7 +14,10 @@ public class PrefixCommand implements Command {
public void executed(String[] args, CommandEvent event) {
if (args.length == 1) {
event.getRethink().setUserPrefix(args[0], event.getAuthor().getId());
event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO).setTitle("✅ Successfully set ✅").setDescription("I successfully set the new prefix for you to " + args[0]).build()).queue();
event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO)
.setTitle(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.settings.prefix.success.title"))
.setDescription(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.settings.prefix.success.description", args[0]))
.build()).queue();
} else {
event.getHelpCommand().sendHelp(this, event);
}
@ -27,11 +30,11 @@ public class PrefixCommand implements Command {
@Override
public String description() {
return "Sets a new Prefix";
return MessageEditor.handle("en", "commands.settings.prefix.help.description");
}
@Override
public String usage() {
return "<New Prefix>";
return MessageEditor.handle("en", "prefix");
}
}

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

@ -12,6 +12,7 @@ searchterm = <SearchTerm>
username = <Username>
number = <Number>
guildprefix = <New Guild-Prefix>
prefix = <New Prefix>
vc-name/id = <VoiceChannelID|VoiceChannelName>
user+nickname = <@user> <New Nickname>
region = <region>
@ -206,3 +207,11 @@ commands.owner.shutdown.success.title = Shutdown
commands.owner.shutdown.help.description = Shuts the Bot down
commands.owner.test.success = TEST my friends
commands.owner.test.help.description = Just a little Test Command
commands.settings.language.success.title = Language set
commands.settings.language.success.description = %extra% is your new language now.
commands.settings.language.help.description = Sets the new primary language for a user.
commands.settings.language.help.usage = <Language code>
commands.settings.prefix.success.title = %extra% Successfully set %extra%
commands.settings.prefix.success.description = I successfully set the new prefix for you to %extra%.
commands.settings.prefix.help.description = Sets a new Prefix