diff --git a/src/main/java/com/bbn/hadder/commands/owner/EvalCommand.java b/src/main/java/com/bbn/hadder/commands/owner/EvalCommand.java index d2e9894..4824cca 100644 --- a/src/main/java/com/bbn/hadder/commands/owner/EvalCommand.java +++ b/src/main/java/com/bbn/hadder/commands/owner/EvalCommand.java @@ -59,16 +59,16 @@ public class EvalCommand implements Command { out = engine.eval(script); event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO) - .setTitle("Eval Command") - .addField("Input", "```java\n\n" + script + "```", false) - .addField("Output", "```java\n\n" + out.toString() + "```", false) - .addField("Timing", System.currentTimeMillis()-startExec + " milliseconds", false) + .setTitle(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.owner.eval.success.title")) + .addField(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.owner.eval.success.input"), "```java\n\n" + script + "```", false) + .addField(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.owner.eval.success.output"), "```java\n\n" + out.toString() + "```", false) + .addField(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.owner.eval.success.timing"), System.currentTimeMillis()-startExec + " milliseconds", false) .build()).queue(); } catch (Exception ex) { event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO) - .setTitle("Eval Command") - .addField("Error", "```java\n\n" + ex.getMessage() + "```", false) - .addField("Timing", System.currentTimeMillis()-startExec + " milliseconds", false) + .setTitle(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.owner.eval.success.title")) + .addField(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "error"), "```java\n\n" + ex.getMessage() + "```", false) + .addField(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.owner.eval.success.timing"), System.currentTimeMillis()-startExec + " milliseconds", false) .build()).queue(); } @@ -92,11 +92,11 @@ public class EvalCommand implements Command { @Override public String description() { - return "Execute the given code"; + return MessageEditor.handle("en", "commands.owner.eval.help.description"); } @Override public String usage() { - return ""; + return MessageEditor.handle("en", "commands.owner.eval.help.usage"); } } diff --git a/src/main/java/com/bbn/hadder/commands/owner/GuildLeaveCommand.java b/src/main/java/com/bbn/hadder/commands/owner/GuildLeaveCommand.java index 90d1318..1c86d88 100644 --- a/src/main/java/com/bbn/hadder/commands/owner/GuildLeaveCommand.java +++ b/src/main/java/com/bbn/hadder/commands/owner/GuildLeaveCommand.java @@ -18,8 +18,8 @@ public class GuildLeaveCommand implements Command { Guild guild = event.getJDA().getGuildById(args[0]); guild.leave().queue(); event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO) - .setTitle("Successfully left") - .setDescription("I successfully left " + guild.getName()) + .setTitle(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.owner.guildleave.success.title")) + .setDescription(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.owner.guildleave.success.description", guild.getName())) .build()).queue(); } else { event.getHelpCommand().sendHelp(this, event); @@ -36,11 +36,11 @@ public class GuildLeaveCommand implements Command { @Override public String description() { - return "Quit from a guild"; + return MessageEditor.handle("en", "commands.owner.guildleave.help.description"); } @Override public String usage() { - return ""; + return MessageEditor.handle("en", "guildid"); } } diff --git a/src/main/java/com/bbn/hadder/commands/owner/RebootCommand.java b/src/main/java/com/bbn/hadder/commands/owner/RebootCommand.java index cb37c27..dd1a98b 100644 --- a/src/main/java/com/bbn/hadder/commands/owner/RebootCommand.java +++ b/src/main/java/com/bbn/hadder/commands/owner/RebootCommand.java @@ -27,7 +27,7 @@ public class RebootCommand implements Command { @Override public String description() { - return "Restart the bot"; + return MessageEditor.handle("en", "commands.owner.reboot.help.description"); } @Override diff --git a/src/main/java/com/bbn/hadder/commands/owner/ShutdownCommand.java b/src/main/java/com/bbn/hadder/commands/owner/ShutdownCommand.java index 14cfdd2..d197aab 100644 --- a/src/main/java/com/bbn/hadder/commands/owner/ShutdownCommand.java +++ b/src/main/java/com/bbn/hadder/commands/owner/ShutdownCommand.java @@ -29,7 +29,7 @@ public class ShutdownCommand implements Command { @Override public String description() { - return "Shuts the Bot down"; + return MessageEditor.handle("en", "commands.owner.shutdown.help.description"); } @Override diff --git a/src/main/java/com/bbn/hadder/commands/owner/TestCommand.java b/src/main/java/com/bbn/hadder/commands/owner/TestCommand.java index e50a638..e9219d6 100644 --- a/src/main/java/com/bbn/hadder/commands/owner/TestCommand.java +++ b/src/main/java/com/bbn/hadder/commands/owner/TestCommand.java @@ -2,6 +2,7 @@ package com.bbn.hadder.commands.owner; import com.bbn.hadder.commands.Command; import com.bbn.hadder.commands.CommandEvent; +import com.bbn.hadder.utils.MessageEditor; /* * @author Skidder / GregTCLTK @@ -11,7 +12,7 @@ public class TestCommand implements Command { @Override public void executed(String[] args, CommandEvent event) { - event.getTextChannel().sendMessage("TEST my friends").queue(); + event.getTextChannel().sendMessage(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.owner.test.success")).queue(); } @Override @@ -21,7 +22,7 @@ public class TestCommand implements Command { @Override public String description() { - return "Just a little Test Command"; + return MessageEditor.handle("en", "commands.owner.test.help.description"); } @Override diff --git a/src/main/java/com/bbn/hadder/commands/settings/LanguageCommand.java b/src/main/java/com/bbn/hadder/commands/settings/LanguageCommand.java index 4faa2c6..c902fa4 100644 --- a/src/main/java/com/bbn/hadder/commands/settings/LanguageCommand.java +++ b/src/main/java/com/bbn/hadder/commands/settings/LanguageCommand.java @@ -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 ""; + return MessageEditor.handle("en", "commands.settings.language.help.usage"); } } diff --git a/src/main/java/com/bbn/hadder/commands/settings/PrefixCommand.java b/src/main/java/com/bbn/hadder/commands/settings/PrefixCommand.java index 4de3e84..6e3b3ee 100644 --- a/src/main/java/com/bbn/hadder/commands/settings/PrefixCommand.java +++ b/src/main/java/com/bbn/hadder/commands/settings/PrefixCommand.java @@ -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 ""; + return MessageEditor.handle("en", "prefix"); } } diff --git a/src/main/resources/Translations/Translations_en.properties b/src/main/resources/Translations/Translations_en.properties index 01b86cc..dec548c 100644 --- a/src/main/resources/Translations/Translations_en.properties +++ b/src/main/resources/Translations/Translations_en.properties @@ -12,9 +12,11 @@ searchterm = username = number = guildprefix = +prefix = vc-name/id = user+nickname = <@user> region = +guildid = error = Error none = None @@ -190,3 +192,26 @@ commands.nsfw.randomporn.help.description = Shows a completely random porn gif. commands.nsfw.solo.help.description = Shows a random solo gif. commands.nsfw.spank.help.description = Shows a random spank gif. commands.nsfw.trans.help.description = Shows a random trans picture. + +commands.owner.eval.success.title = Eval Command +commands.owner.eval.success.input = Input +commands.owner.eval.success.output = Output +commands.owner.eval.success.timing = Timing +commands.owner.eval.help.description = Execute the given code +commands.owner.eval.help.usage = +commands.owner.guildleave.success.title = Successfully left +commands.owner.guildleave.success.description = I successfully left %extra%. +commands.owner.guildleave.help.description = Quit from a guild +commands.owner.reboot.help.description = Restart the bot +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 = +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