diff --git a/src/main/java/com/bbn/hadder/Rethink.java b/src/main/java/com/bbn/hadder/Rethink.java index ccbebdd..cdb08e4 100644 --- a/src/main/java/com/bbn/hadder/Rethink.java +++ b/src/main/java/com/bbn/hadder/Rethink.java @@ -189,4 +189,8 @@ public class Rethink { this.update("users", user_id, "language", language); } + public String getLanguage(String user_id) { + return (String) this.get("user", "id", user_id, "language"); + } + } diff --git a/src/main/java/com/bbn/hadder/commands/fun/AvatarCommand.java b/src/main/java/com/bbn/hadder/commands/fun/AvatarCommand.java index 2e807c2..88cc91c 100644 --- a/src/main/java/com/bbn/hadder/commands/fun/AvatarCommand.java +++ b/src/main/java/com/bbn/hadder/commands/fun/AvatarCommand.java @@ -16,14 +16,14 @@ public class AvatarCommand implements Command { if (args.length == 0) { Member member = event.getMember(); event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO) - .setTitle("Avatar of " + member.getUser().getAsTag()) + .setTitle(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.fun.avatar.success.title") + member.getUser().getAsTag()) .setImage(member.getUser().getAvatarUrl()) .setFooter(member.getUser().getAsTag()) .build()).queue(); } else if (event.getMessage().getMentionedMembers().size() == 1) { Member member = event.getMessage().getMentionedMembers().get(0); event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO) - .setTitle("Avatar of " + member.getUser().getAsTag()) + .setTitle(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.fun.avatar.success.title") + member.getUser().getAsTag()) .setImage(member.getUser().getAvatarUrl()) .setFooter(member.getUser().getAsTag()) .build()).queue(); @@ -46,11 +46,11 @@ public class AvatarCommand implements Command { @Override public String description() { - return "Sends the avatar of the specified member."; + return MessageEditor.handle("en", "commands.fun.avatar.help.description"); } @Override public String usage() { - return "<@User>/"; + return "[@User]/[ID]"; } } diff --git a/src/main/java/com/bbn/hadder/commands/fun/GifCommand.java b/src/main/java/com/bbn/hadder/commands/fun/GifCommand.java index 7503bc4..0abe35a 100644 --- a/src/main/java/com/bbn/hadder/commands/fun/GifCommand.java +++ b/src/main/java/com/bbn/hadder/commands/fun/GifCommand.java @@ -37,7 +37,7 @@ public class GifCommand implements Command { String url = array.getJSONObject(gifIndex).get("url").toString(); event.getTextChannel().sendMessage(url).queue(); } catch (Exception e) { - event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.ERROR).setTitle("Error").setDescription("Please try again with another term.").build()).queue(); + event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.ERROR).setTitle("Error").setDescription(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.fun.gif.error.description")).build()).queue(); } } else event.getHelpCommand().sendHelp(this, event); } @@ -49,7 +49,7 @@ public class GifCommand implements Command { @Override public String description() { - return "Look for a GIF on Giphy"; + return MessageEditor.handle("en", "commands.fun.gif.help.description"); } @Override diff --git a/src/main/java/com/bbn/hadder/commands/fun/MemeCommand.java b/src/main/java/com/bbn/hadder/commands/fun/MemeCommand.java index 67a1b44..143c9b6 100644 --- a/src/main/java/com/bbn/hadder/commands/fun/MemeCommand.java +++ b/src/main/java/com/bbn/hadder/commands/fun/MemeCommand.java @@ -28,14 +28,14 @@ public class MemeCommand implements Command { JSONObject json = new JSONObject(response.body().string()); String url = json.get("image").toString(); event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO) - .setTitle("Your random meme") + .setTitle(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.fun.meme.success.title")) .setImage(url) .build()).queue(); } catch (IOException e) { e.printStackTrace(); event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.ERROR) - .setTitle("Error") - .setDescription("The request to the meme API could not be processed. Please try it again later.") + .setTitle(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "error")) + .setDescription(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.fun.meme.api.error")) .setColor(Color.RED) .build()).queue(); } @@ -48,7 +48,7 @@ public class MemeCommand implements Command { @Override public String description() { - return "Sends you a random meme."; + return MessageEditor.handle("en", "commands.fun.meme.help.description"); } @Override diff --git a/src/main/java/com/bbn/hadder/commands/general/AboutCommand.java b/src/main/java/com/bbn/hadder/commands/general/AboutCommand.java index 8fb0b28..2512d2f 100644 --- a/src/main/java/com/bbn/hadder/commands/general/AboutCommand.java +++ b/src/main/java/com/bbn/hadder/commands/general/AboutCommand.java @@ -13,9 +13,9 @@ public class AboutCommand implements Command { @Override public void executed(String[] args, CommandEvent event) { event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO) - .setTitle("Hadder - About") - .setDescription("Hadder is an open source Discord bot.") - .addField("Support the Developers", "Hadder is completely free for everyone. We would appreciate it you donate some money [here](https://donatebot.io/checkout/448554629282922527?buyer=" + event.getAuthor().getId() + "). :smiley:", true) + .setTitle(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.general.about.success.title")) + .setDescription(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.general.about.success.description")) + .addField(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.general.about.success.field.one.title"), MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.general.about.success.field.one.description") + "(https://donatebot.io/checkout/448554629282922527?buyer=" + event.getAuthor().getId() + "). :smiley:", true) .setThumbnail("https://bigbotnetwork.com/images/Hadder.png") .build()).queue(); } @@ -27,7 +27,7 @@ public class AboutCommand implements Command { @Override public String description() { - return "Shows infos about Hadder."; + return MessageEditor.handle("en", "commands.general.about.help.description"); } @Override diff --git a/src/main/java/com/bbn/hadder/commands/general/EqualsCommand.java b/src/main/java/com/bbn/hadder/commands/general/EqualsCommand.java index 9fdb21f..e5d2b90 100644 --- a/src/main/java/com/bbn/hadder/commands/general/EqualsCommand.java +++ b/src/main/java/com/bbn/hadder/commands/general/EqualsCommand.java @@ -16,22 +16,22 @@ public class EqualsCommand implements Command { event.getChannel().sendMessage( new MessageEditor() .setDefaultSettings(MessageEditor.MessageType.INFO) - .setTitle("Please send me the first String") + .setTitle(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.general.equals.string.first.request")) .build()).queue(); new EventWaiter().newOnMessageEventWaiter(msgevent -> { String firstString = msgevent.getMessage().getContentRaw(); event.getChannel().sendMessage( new MessageEditor() .setDefaultSettings( - MessageEditor.MessageType.INFO).setTitle("Please send me the second String").build()).queue(); + MessageEditor.MessageType.INFO).setTitle(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.general.equals.string.second.request")).build()).queue(); new EventWaiter().newOnMessageEventWaiter(msgevent2 -> { String secondString = msgevent2.getMessage().getContentRaw(); event.getChannel().sendMessage( new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO) - .setTitle((firstString.equals(secondString)) ? "Yes! The first string equals the second string!" : "Well yes, but actually No. This isn't the same.") - .addField("First String", firstString, false) - .addField("Second String", secondString, false) - .addField("Result", String.valueOf(firstString.equals(secondString)), false) + .setTitle((firstString.equals(secondString)) ? MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.general.equals.string.equals.true") : MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.general.equals.string.equals.false")) + .addField(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.general.equals.string.first"), firstString, false) + .addField(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.general.equals.string.second"), secondString, false) + .addField(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.general.equals.string.result"), String.valueOf(firstString.equals(secondString)), false) .build()).queue(); }, event.getJDA(), event.getAuthor()); }, event.getJDA(), event.getAuthor()); @@ -44,7 +44,7 @@ public class EqualsCommand implements Command { @Override public String description() { - return "Check if two strings are the same."; + return MessageEditor.handle("en", "commands.general.equals.help.description"); } @Override diff --git a/src/main/java/com/bbn/hadder/commands/general/HelpCommand.java b/src/main/java/com/bbn/hadder/commands/general/HelpCommand.java index 476da32..aeb53b0 100644 --- a/src/main/java/com/bbn/hadder/commands/general/HelpCommand.java +++ b/src/main/java/com/bbn/hadder/commands/general/HelpCommand.java @@ -51,7 +51,7 @@ public class HelpCommand implements Command { } } } else { - event.getTextChannel().sendMessage("I need the Embed Links Permission to send the Help Menu!").queue(); + event.getTextChannel().sendMessage(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.general.help.error.description")).queue(); } } @@ -74,11 +74,11 @@ public class HelpCommand implements Command { @Override public String description() { - return "Shows each command or explains its usage."; + return MessageEditor.handle("en", "commands.general.help.help.description"); } @Override public String usage() { - return "[CommandName]"; + return MessageEditor.handle("en", "commands.general.help.help.label"); } } diff --git a/src/main/java/com/bbn/hadder/commands/general/InviteCommand.java b/src/main/java/com/bbn/hadder/commands/general/InviteCommand.java index 093b03c..e761514 100644 --- a/src/main/java/com/bbn/hadder/commands/general/InviteCommand.java +++ b/src/main/java/com/bbn/hadder/commands/general/InviteCommand.java @@ -1,9 +1,5 @@ package com.bbn.hadder.commands.general; -/* - * @author Skidder / GregTCLTK - */ - import com.bbn.hadder.Hadder; import com.bbn.hadder.commands.Command; import com.bbn.hadder.commands.CommandEvent; @@ -18,8 +14,8 @@ public class InviteCommand implements Command { @Override public void executed(String[] args, CommandEvent event) { event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO) - .setTitle("Invite me!") - .setDescription("[Invite me here!](https://discordapp.com/oauth2/authorize?client_id=" + Hadder.shardManager.getGuilds().get(0).getSelfMember().getId() + "&scope=bot&permissions=470133879)") + .setTitle(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.general.invite.success.title")) + .setDescription(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.general.invite.success.description") + "(https://discordapp.com/oauth2/authorize?client_id=" + Hadder.shardManager.getGuilds().get(0).getSelfMember().getId() + "&scope=bot&permissions=470133879)") .build()).queue(); } @@ -30,7 +26,7 @@ public class InviteCommand implements Command { @Override public String description() { - return "Shows the invitation to invite Hadder to your server."; + return MessageEditor.handle("en", "commands.general.invite.help.description"); } @Override diff --git a/src/main/java/com/bbn/hadder/commands/general/PingCommand.java b/src/main/java/com/bbn/hadder/commands/general/PingCommand.java index 0cb5849..a4b691b 100644 --- a/src/main/java/com/bbn/hadder/commands/general/PingCommand.java +++ b/src/main/java/com/bbn/hadder/commands/general/PingCommand.java @@ -22,7 +22,7 @@ public class PingCommand implements Command { @Override public String description() { - return "Shows the ping to the Discord API."; + return MessageEditor.handle("en", "commands.general.ping.help.description"); } @Override diff --git a/src/main/java/com/bbn/hadder/commands/misc/FeedbackCommand.java b/src/main/java/com/bbn/hadder/commands/misc/FeedbackCommand.java index c4889da..f677e31 100644 --- a/src/main/java/com/bbn/hadder/commands/misc/FeedbackCommand.java +++ b/src/main/java/com/bbn/hadder/commands/misc/FeedbackCommand.java @@ -19,14 +19,14 @@ public class FeedbackCommand implements Command { @Override public void executed(String[] args, CommandEvent event) { event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO) - .setTitle("Feedback Topic") - .setDescription("Please send me the feedback topic.") + .setTitle(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.misc.feedback.title.request.title")) + .setDescription(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.misc.feedback.title.request.description")) .build()).queue(); new EventWaiter().newOnMessageEventWaiter(event1 -> { String title = event1.getMessage().getContentDisplay(); event1.getChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO) - .setTitle("Feedback Description") - .setDescription("Please send me the feedback description now.") + .setTitle(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.misc.feedback.description.request.title")) + .setTitle(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.misc.feedback.description.request.description")) .build()).queue(); new EventWaiter().newOnMessageEventWaiter(event2 -> { String description = event2.getMessage().getContentDisplay(); @@ -53,7 +53,7 @@ public class FeedbackCommand implements Command { @Override public String description() { - return "Sends feedback directly to the developers."; + return MessageEditor.handle("en", "commands.misc.feedback.help.description"); } @Override diff --git a/src/main/java/com/bbn/hadder/commands/misc/GitHubCommand.java b/src/main/java/com/bbn/hadder/commands/misc/GitHubCommand.java index c6aa12b..187c344 100644 --- a/src/main/java/com/bbn/hadder/commands/misc/GitHubCommand.java +++ b/src/main/java/com/bbn/hadder/commands/misc/GitHubCommand.java @@ -21,7 +21,7 @@ public class GitHubCommand implements Command { public void executed(String[] args, CommandEvent event) { if (args.length > 0) { if (args[0].equals("link")) { - event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO).setTitle("Link your GitHub Account").setDescription("https://github.com/login/oauth/authorize?client_id=25321f690bb1b6952942").build()).queue(); + event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO).setTitle(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.misc.github.link.title")).setDescription("https://github.com/login/oauth/authorize?client_id=25321f690bb1b6952942").build()).queue(); } else { Request request = new Request.Builder().url("https://api.github.com/users/" + args[0]).build(); try { @@ -45,27 +45,27 @@ public class GitHubCommand implements Command { if (!json.getString("blog").equals("")) website = json.getString("blog"); event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO) - .setAuthor("Information about " + nickname + " (" + args[0] + ")", "https://github.com/" + args[0] + "", "https://github.githubassets.com/images/modules/logos_page/GitHub-Mark.png") + .setAuthor(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.misc.github.success.title") + nickname + " (" + args[0] + ")", "https://github.com/" + args[0] + "", "https://github.githubassets.com/images/modules/logos_page/GitHub-Mark.png") .setThumbnail(json.getString("avatar_url")) - .addField("User bio", bio, false) - .addField("Location", location, true) - .addField("Website", website, true) - .addField("Public repositories", String.valueOf(json.getInt("public_repos")), true) - .addField("Public gists", String.valueOf(json.getInt("public_gists")), true) - .addField("Followers", String.valueOf(json.getInt("followers")), true) - .addField("Following", String.valueOf(json.getInt("following")), true) + .addField(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.misc.github.success.bio"), bio, false) + .addField(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.misc.github.success.location"), location, true) + .addField(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.misc.github.success.website"), website, true) + .addField(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.misc.github.success.repositories"), String.valueOf(json.getInt("public_repos")), true) + .addField(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.misc.github.success.gists"), String.valueOf(json.getInt("public_gists")), true) + .addField(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.misc.github.success.followers"), String.valueOf(json.getInt("followers")), true) + .addField(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.misc.github.success.following"), String.valueOf(json.getInt("following")), true) .build()).queue(); } catch (IOException | NullPointerException e) { - event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.ERROR).setDescription("The GitHub API might be down at the moment!").build()).queue(); + event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.ERROR).setDescription(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.misc.github.api.error.description")).build()).queue(); } catch (JSONException e) { - event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.WARNING).setDescription("This user does not exist!").build()).queue(); + event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.WARNING).setDescription(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.misc.github.user.error.description")).build()).queue(); } } } else { event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO) - .setTitle("Connect you GH account") - .setDescription("[Please connect your GitHub account here](https://github.com/login/oauth/authorize?client_id=25321f690bb1b6952942)") + .setTitle(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.misc.github.connect.title")) + .setDescription(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.misc.github.connect.description") + "(https://github.com/login/oauth/authorize?client_id=25321f690bb1b6952942)") .build()).queue(); } } @@ -77,11 +77,11 @@ public class GitHubCommand implements Command { @Override public String description() { - return "Displays information about a GitHub user profile."; + return MessageEditor.handle("en", "commands.misc.github.help.description"); } @Override public String usage() { - return ""; + return MessageEditor.handle("en", "username"); } } diff --git a/src/main/java/com/bbn/hadder/commands/misc/ScreenShareCommand.java b/src/main/java/com/bbn/hadder/commands/misc/ScreenShareCommand.java index f320a6d..7e694c0 100644 --- a/src/main/java/com/bbn/hadder/commands/misc/ScreenShareCommand.java +++ b/src/main/java/com/bbn/hadder/commands/misc/ScreenShareCommand.java @@ -19,14 +19,14 @@ public class ScreenShareCommand implements Command { try { if (vc.getIdLong() == Long.parseLong(args[0])) { event.getChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO) - .setTitle("Here's your Url to share your Screen") + .setTitle(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.misc.screenshare.success.title")) .setDescription("http://discordapp.com/channels/" + event.getGuild().getId() + "/" + vc.getId() + "/").build()).queue(); return; } } catch (NumberFormatException e) { event.getChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.ERROR) - .setTitle("Wait, that's illegal") - .setDescription("This ID is invalid. \nMaybe you entered a wrong ID? \n\nNote: Make sure the Voice Channel is on this Guild.").build()).queue(); + .setTitle(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.misc.screenshare.id.error.title")) + .setDescription(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.misc.screenshare.id.error.description")).build()).queue(); event.getHelpCommand().sendHelp(this, event); return; } @@ -35,8 +35,8 @@ public class ScreenShareCommand implements Command { List vcs = event.getGuild().getVoiceChannelsByName(String.join(" ", args), true); if (vcs.size() > 1) { EmbedBuilder eb = new EmbedBuilder() - .setTitle("Please Choose a Voice Channel") - .setDescription("There is more than one channel with this name"); + .setTitle(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.misc.screenshare.channel.error.title")) + .setDescription(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.misc.screenshare.channel.error.description")); for (int i = 0; i < vcs.size(); i++) { VoiceChannel voiceChannel = vcs.get(i); eb.addField(i + ": " + voiceChannel.getName(), voiceChannel.getId(), false); @@ -47,29 +47,29 @@ public class ScreenShareCommand implements Command { int i = Integer.parseInt(msgevent.getMessage().getContentRaw()); if (vcs.size() > i) { event.getChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO) - .setTitle("Here's your Url to share your Screen") + .setTitle(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.misc.screenshare.success.title")) .setDescription("http://discordapp.com/channels/" + event.getGuild().getId() + "/" + vcs.get(i).getId() + "/").build()).queue(); } else { event.getChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.ERROR) - .setTitle("You specified a wrong number!").build()).queue(); + .setTitle(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.misc.screenshare.number.error.title")).build()).queue(); event.getHelpCommand().sendHelp(this, event); } } catch (NumberFormatException e) { event.getChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.ERROR) - .setTitle("Wait, that's illegal") - .setDescription("This isn't a Number.").build()).queue(); + .setTitle(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.misc.screenshare.id.error.title")) + .setDescription(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.misc.screenshare.number.error.description")).build()).queue(); event.getHelpCommand().sendHelp(this, event); } }, event.getJDA(), event.getAuthor()); } else if (vcs.size()==0) { event.getChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.ERROR) - .setTitle("Hol' up") - .setDescription("There is no Voice Channel named like this. \n\nNote: Make sure the Voice Channel is on this Guild.").build()).queue(); + .setTitle(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.misc.screenshare.channel.existing.error")) + .setDescription(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.misc.screenshare.channel.existing.description")).build()).queue(); event.getHelpCommand().sendHelp(this, event); } else { event.getChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO) - .setTitle("Here's your Url to share your Screen") + .setTitle(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.misc.screenshare.success.title")) .setDescription("http://discordapp.com/channels/" + event.getGuild().getId() + "/" + vcs.get(0).getId() + "/").build()).queue(); } } @@ -85,11 +85,11 @@ public class ScreenShareCommand implements Command { @Override public String description() { - return "Shows you the link to share your screen."; + return MessageEditor.handle("en", "commands.misc.screenshare.help.description"); } @Override public String usage() { - return ""; + return MessageEditor.handle("en", "vc-name/id"); } } diff --git a/src/main/java/com/bbn/hadder/commands/moderation/BanCommand.java b/src/main/java/com/bbn/hadder/commands/moderation/BanCommand.java index 6796b72..ca68aae 100644 --- a/src/main/java/com/bbn/hadder/commands/moderation/BanCommand.java +++ b/src/main/java/com/bbn/hadder/commands/moderation/BanCommand.java @@ -21,15 +21,15 @@ public class BanCommand implements Command { if (!event.getJDA().getSelfUser().getId().equals(victim.getId())) { if (event.getGuild().getSelfMember().canInteract(victim)) { event.getGuild().ban(victim, 0, "Banned by " + event.getAuthor().getAsTag()).queue(); - event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO).setTitle("✅ Successfully banned ✅").setDescription("I successfully baned " + victim.getUser().getName() + ".").build()).queue(); + event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO).setTitle(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.moderation.ban.success.title")).setDescription(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.moderation.ban.success.description") + victim.getUser().getName() + ".").build()).queue(); } else { event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.NO_SELF_PERMISSION).build()).queue(); } } else { - event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.WARNING).setTitle("Not possible").setDescription("I can not ban myself!").build()).queue(); + event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.WARNING).setTitle(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.moderation.ban.error.title")).setDescription(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.moderation.ban.myself.error.description")).build()).queue(); } } else { - event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.WARNING).setTitle("Not possible").setDescription("You can't ban yourself!").build()).queue(); + event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.WARNING).setTitle(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.moderation.ban.error.title")).setDescription(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.moderation.ban.yourself.error.description")).build()).queue(); } } else if (event.getMessage().getMentionedMembers().size() == 0) { event.getHelpCommand().sendHelp(this, event); @@ -44,13 +44,13 @@ public class BanCommand implements Command { event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.NO_SELF_PERMISSION).build()).queue(); } } else { - event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.WARNING).setDescription("I can not ban myself!").build()).queue(); + event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.WARNING).setTitle(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.moderation.ban.error.title")).setDescription(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.moderation.ban.myself.error.description")).build()).queue(); } } else { - event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.WARNING).setDescription("You can't ban yourself!").build()).queue(); + event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.WARNING).setTitle(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.moderation.ban.error.title")).setDescription(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.moderation.ban.yourself.error.description")).build()).queue(); } } - event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO).setTitle("✅ Successfully banned ✅").setDescription("I successfully banned " + event.getMessage().getMentionedMembers().size() + " Members!").build()).queue(); + event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO).setTitle(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.moderation.ban.success.title")).setDescription(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.moderation.ban.success.description") + event.getMessage().getMentionedMembers().size() + " Members!").build()).queue(); } } else { event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.NO_PERMISSION).build()).queue(); @@ -64,7 +64,7 @@ public class BanCommand implements Command { @Override public String description() { - return "Bans one ore more user from the server."; + return MessageEditor.handle("en", "commands.moderation.ban.help.description"); } @Override diff --git a/src/main/java/com/bbn/hadder/commands/moderation/ClearCommand.java b/src/main/java/com/bbn/hadder/commands/moderation/ClearCommand.java index d5fe960..3138c18 100644 --- a/src/main/java/com/bbn/hadder/commands/moderation/ClearCommand.java +++ b/src/main/java/com/bbn/hadder/commands/moderation/ClearCommand.java @@ -24,15 +24,15 @@ public class ClearCommand implements Command { if (event.getGuild().getMemberById(event.getJDA().getSelfUser().getId()).hasPermission(Permission.MESSAGE_MANAGE)) { try { int nbToDelete = Integer.parseInt(args[0]); - if(nbToDelete < 1 || nbToDelete > 200) { - event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.WARNING).setDescription("You have to choose a number between 1 and 99!").build()).queue(); + if(nbToDelete < 1 || nbToDelete > 99) { + event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.WARNING).setDescription(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.moderation.clear.number.error.description")).build()).queue(); return; } List history = event.getTextChannel().getHistory().retrievePast(nbToDelete +1).complete(); List msgToDelete = new ArrayList<>(); msgToDelete.addAll(history); event.getTextChannel().deleteMessages(msgToDelete).queue(); - Message msg = event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO).setDescription("Successfully deleted " + nbToDelete + " messages.").build()).complete(); + Message msg = event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO).setDescription(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.moderation.clear.success.description") + nbToDelete + " messages.").build()).complete(); try { TimeUnit.SECONDS.sleep(2); } catch (InterruptedException e) { @@ -60,11 +60,11 @@ public class ClearCommand implements Command { @Override public String description() { - return "Deletes the specified number of messages."; + return MessageEditor.handle("en", "commands.moderation.clear.help.description"); } @Override public String usage() { - return ""; + return MessageEditor.handle("en", "number"); } } diff --git a/src/main/java/com/bbn/hadder/commands/moderation/GuildPrefixCommand.java b/src/main/java/com/bbn/hadder/commands/moderation/GuildPrefixCommand.java index 8891d0f..329b1fe 100644 --- a/src/main/java/com/bbn/hadder/commands/moderation/GuildPrefixCommand.java +++ b/src/main/java/com/bbn/hadder/commands/moderation/GuildPrefixCommand.java @@ -14,9 +14,9 @@ public class GuildPrefixCommand implements Command { if (!args[0].contains("\"")) { event.getRethink().setGuildPrefix(args[0], event.getGuild().getId()); - event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO).setTitle("✅ Successfully set ✅").setDescription("I successfully set the new prefix for the guild to " + args[0]).build()).queue(); + event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO).setTitle(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.moderation.prefix.success.title")).setDescription(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.moderation.prefix.success.description") + args[0]).build()).queue(); } else { - event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.WARNING).setDescription("The prefix must not contain **\"**").build()).queue(); + event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.WARNING).setDescription(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.moderation.prefix.error.description")).build()).queue(); } } else { event.getHelpCommand().sendHelp(this, event); @@ -33,11 +33,11 @@ public class GuildPrefixCommand implements Command { @Override public String description() { - return "Sets the Guild-Prefix."; + return MessageEditor.handle("en", "commands.moderation.prefix.help.description"); } @Override public String usage() { - return ""; + return MessageEditor.handle("en", "guildprefix"); } } diff --git a/src/main/java/com/bbn/hadder/commands/moderation/InviteDetectCommand.java b/src/main/java/com/bbn/hadder/commands/moderation/InviteDetectCommand.java index 084f787..849cbc5 100644 --- a/src/main/java/com/bbn/hadder/commands/moderation/InviteDetectCommand.java +++ b/src/main/java/com/bbn/hadder/commands/moderation/InviteDetectCommand.java @@ -21,13 +21,13 @@ public class InviteDetectCommand implements Command { if (!event.getRethink().getInviteDetection(event.getGuild().getId())) { event.getRethink().setInviteDetection(event.getGuild().getId(), true); event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO) - .setTitle("Successfully activated") - .setDescription("I successfully activated the invite link detection for this guild.") + .setTitle(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.moderation.invitedetect.activate.success.title")) + .setTitle(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.moderation.invitedetect.activate.success.description")) .build()).queue(); } else { event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.WARNING) - .setTitle("Already activated") - .setDescription("The invite link detection is already activated on this guild.") + .setTitle(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.moderation.invitedetect.activate.error.title")) + .setTitle(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.moderation.invitedetect.activate.error.description")) .build()).queue(); } break; @@ -36,13 +36,13 @@ public class InviteDetectCommand implements Command { if (event.getRethink().getInviteDetection(event.getGuild().getId())) { event.getRethink().setInviteDetection(event.getGuild().getId(), false); event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO) - .setTitle("Successfully deactivated") - .setDescription("I successfully deactivated the invite link detection for this guild.") + .setTitle(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.moderation.invitedetect.deactivate.success.title")) + .setDescription(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.moderation.invitedetect.deactivate.success.description")) .build()).queue(); } else { event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.WARNING) - .setTitle("Already deactivated") - .setDescription("The invite link detection is already deactivated on this guild.") + .setTitle(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.moderation.invitedetect.deactivate.error.title")) + .setDescription(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.moderation.invitedetect.deactivate.error.description")) .build()).queue(); } break; @@ -62,7 +62,7 @@ public class InviteDetectCommand implements Command { @Override public String description() { - return "Activate or deactivate the Discord invite link detection."; + return MessageEditor.handle("en", "commands.moderation.invitedetect.help.description"); } @Override diff --git a/src/main/java/com/bbn/hadder/commands/moderation/KickCommand.java b/src/main/java/com/bbn/hadder/commands/moderation/KickCommand.java index 2c44aa4..5a51f7e 100644 --- a/src/main/java/com/bbn/hadder/commands/moderation/KickCommand.java +++ b/src/main/java/com/bbn/hadder/commands/moderation/KickCommand.java @@ -22,15 +22,15 @@ public class KickCommand implements Command { if (!event.getJDA().getSelfUser().getId().equals(victim.getId())) { if (event.getGuild().getSelfMember().canInteract(victim)) { event.getGuild().kick(victim, "Kicked by " + event.getAuthor().getAsTag()).queue(); - event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO).setTitle("✅ Successfully kicked ✅").setDescription("I successfully kicked " + victim.getUser().getName() + ".").build()).queue(); + event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO).setTitle(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.moderation.kick.success.title")).setDescription(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.moderation.kick.success.description") + victim.getUser().getName() + ".").build()).queue(); } else { event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.NO_SELF_PERMISSION).build()).queue(); } } else { - event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.WARNING).setDescription("I can not kick myself!").build()).queue(); + event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.WARNING).setTitle(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.moderation.kick.error.title")).setDescription(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.moderation.kick.myself.error.description")).build()).queue(); } } else { - event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.WARNING).setDescription("You can't kick yourself.").build()).queue(); + event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.WARNING).setTitle(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.moderation.kick.error.title")).setDescription(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.moderation.kick.yourself.error.description")).build()).queue(); } } else if (event.getMessage().getMentionedMembers().size() == 0) { event.getHelpCommand().sendHelp(this, event); @@ -45,13 +45,13 @@ public class KickCommand implements Command { event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.NO_SELF_PERMISSION).build()).queue(); } } else { - event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.WARNING).setDescription("I can not kick myself!").build()).queue(); + event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.WARNING).setTitle(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.moderation.kick.error.title")).setDescription(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.moderation.kick.myself.error.description")).build()).queue(); } } else { - event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.WARNING).setDescription("You can't kick yourself.").build()).queue(); + event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.WARNING).setTitle(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.moderation.kick.error.title")).setDescription(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.moderation.kick.yourself.error.description")).build()).queue(); } } - event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO).setTitle("✅ Successfully kicked ✅").setDescription("I successfully kicked " + event.getMessage().getMentionedMembers().size() + " Members!").build()).queue(); + event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO).setTitle(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.moderation.kick.success.title")).setDescription(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.moderation.kick.success.description") + event.getMessage().getMentionedMembers().size() + " Members!").build()).queue(); } } } @@ -63,7 +63,7 @@ public class KickCommand implements Command { @Override public String description() { - return "Kicks one or more user from the server."; + return MessageEditor.handle("en", "commands.moderation.kick.help.description"); } @Override diff --git a/src/main/java/com/bbn/hadder/commands/moderation/LinkCommand.java b/src/main/java/com/bbn/hadder/commands/moderation/LinkCommand.java index bd8a248..a6c20f2 100644 --- a/src/main/java/com/bbn/hadder/commands/moderation/LinkCommand.java +++ b/src/main/java/com/bbn/hadder/commands/moderation/LinkCommand.java @@ -27,7 +27,7 @@ public class LinkCommand implements Command { if (!found) { event.getChannel().sendMessage( new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO) - .setTitle("Success!").setDescription("If i'm on this guild i sent a message to accept the link.") + .setTitle(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "success!")).setDescription(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.moderation.link.request.success.description")) .build()).queue(); return; } @@ -36,7 +36,7 @@ public class LinkCommand implements Command { if (event.getGuild().getId().equals(args[1])) { event.getChannel().sendMessage( new MessageEditor().setDefaultSettings(MessageEditor.MessageType.ERROR) - .setTitle("Wait that's illegal.").setDescription("You specified the same guild as the guild on which you're reading this").build()).queue(); + .setTitle(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.moderation.link.error.title")).setDescription(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.moderation.link.request.error.description")).build()).queue(); return; } @@ -49,8 +49,8 @@ public class LinkCommand implements Command { // Send Request to link Guild event.getJDA().getTextChannelById(event.getRethink().getLinkChannel(linkid)).sendMessage( new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO) - .setTitle(event.getGuild().getName() + " (" + event.getGuild().getId() + ") wants to link guilds!") - .setDescription("React with the reactions to accept or decline it").build() + .setTitle(event.getGuild().getName() + " (" + event.getGuild().getId() + MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.moderation.link.request.accept.title")) + .setDescription(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.moderation.link.request.accept.description")).build() ).queue( msg -> { msg.addReaction("✅").queue(); @@ -62,7 +62,7 @@ public class LinkCommand implements Command { event.getChannel().sendMessage( new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO) - .setTitle("Success!").setDescription("If i'm on this guild i sent a message to accept the link.") + .setTitle(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "success!")).setDescription(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.moderation.link.request.success.description")) .build()).queue(); break; @@ -70,7 +70,7 @@ public class LinkCommand implements Command { case "channel": if (args.length == 2) { event.getRethink().setLinkChannel(event.getGuild().getId(), args[1]); - event.getChannel().sendMessage(new EmbedBuilder().setTitle("Success").setDescription("Set the thing boi").build()).queue(); + event.getChannel().sendMessage(new EmbedBuilder().setTitle(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "success!")).setDescription(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.moderation.link.set.title")).build()).queue(); } break; @@ -84,7 +84,7 @@ public class LinkCommand implements Command { @Override public String description() { - return "Links two or more servers."; + return MessageEditor.handle("en", "commands.moderation.link.help.description"); } @Override diff --git a/src/main/java/com/bbn/hadder/commands/moderation/NickCommand.java b/src/main/java/com/bbn/hadder/commands/moderation/NickCommand.java index 7aad865..6ec0fce 100644 --- a/src/main/java/com/bbn/hadder/commands/moderation/NickCommand.java +++ b/src/main/java/com/bbn/hadder/commands/moderation/NickCommand.java @@ -22,10 +22,10 @@ public class NickCommand implements Command { if (args.length > 1) { if (event.getMessage().getContentRaw().startsWith(event.getRethink().getUserPrefix(event.getMember().getId()))) { event.getGuild().modifyNickname(event.getMessage().getMentionedMembers().get(0), event.getMessage().getContentRaw().replaceFirst(event.getRethink().getUserPrefix(event.getMember().getId()) + "nick " + args[0], "")).reason("Nicked by " + event.getAuthor().getAsTag()).queue(); - event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO).setTitle("✅ Successfully nicked ✅").setDescription("I successfully nicked " + event.getMessage().getMentionedMembers().get(0).getUser().getAsTag() + ".").build()).queue(); + event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO).setTitle(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.moderation.nick.success.title")).setDescription(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.moderation.nick.success.description") + event.getMessage().getMentionedMembers().get(0).getUser().getAsTag() + ".").build()).queue(); } else if (event.getMessage().getContentRaw().startsWith(event.getRethink().getGuildPrefix(event.getGuild().getId()))) { event.getGuild().modifyNickname(event.getMessage().getMentionedMembers().get(0), event.getMessage().getContentRaw().replaceFirst(event.getRethink().getGuildPrefix(event.getGuild().getId()) + "nick " + args[0], "")).reason("Nicked by " + event.getAuthor().getAsTag()).queue(); - event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO).setTitle("✅ Successfully nicked ✅").setDescription("I successfully nicked " + event.getMessage().getMentionedMembers().get(0).getUser().getAsTag() + ".").build()).queue(); + event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO).setTitle(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.moderation.nick.success.title")).setDescription(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.moderation.nick.success.description") + event.getMessage().getMentionedMembers().get(0).getUser().getAsTag() + ".").build()).queue(); } } else { event.getHelpCommand().sendHelp(this, event); @@ -36,10 +36,10 @@ public class NickCommand implements Command { } else { if (event.getMessage().getContentRaw().startsWith(event.getRethink().getUserPrefix(event.getMember().getId()))) { event.getGuild().getSelfMember().modifyNickname(event.getMessage().getContentRaw().replaceFirst(event.getRethink().getUserPrefix(event.getMember().getId()) + "nick " + args[0], "")).reason("Nicked by " + event.getAuthor().getAsTag()).queue(); - event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO).setTitle("✅ Successfully nicked ✅").setDescription("I successfully changed my nickname.").build()).queue(); + event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO).setTitle(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.moderation.nick.success.title")).setDescription(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.moderation.nick.myself.success.description")).build()).queue(); } else if (event.getMessage().getContentRaw().startsWith(event.getRethink().getGuildPrefix(event.getGuild().getId()))) { event.getGuild().getSelfMember().modifyNickname(event.getMessage().getContentRaw().replaceFirst(event.getRethink().getGuildPrefix(event.getGuild().getId()) + "nick " + args[0], "")).reason("Nicked by " + event.getAuthor().getAsTag()).queue(); - event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO).setTitle("✅ Successfully nicked ✅").setDescription("I successfully changed my nickname.").build()).queue(); + event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO).setTitle(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.moderation.nick.success.title")).setDescription(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.moderation.nick.myself.success.description")).build()).queue(); } } } else if (event.getMessage().getMentionedMembers().size() == 0) { @@ -53,7 +53,7 @@ public class NickCommand implements Command { event.getGuild().getSelfMember().modifyNickname(args[args.length - 1]).reason("Mass Nicked by " + event.getAuthor().getAsTag()).queue(); } } - event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO).setTitle("✅ Successfully nicked ✅").setDescription("I successfully nicked " + event.getMessage().getMentionedMembers().size() + " Members!").build()).queue(); + event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO).setTitle(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.moderation.nick.success.title")).setDescription(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.moderation.nick.myself.success.description") + event.getMessage().getMentionedMembers().size() + " Members!").build()).queue(); } } else { event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.NO_SELF_PERMISSION).build()).queue(); @@ -70,11 +70,11 @@ public class NickCommand implements Command { @Override public String description() { - return "Rename a one or more user."; + return MessageEditor.handle("en", "commands.moderation.nick.help.description"); } @Override public String usage() { - return "<@user> "; + return MessageEditor.handle("en", "user+nickname"); } } diff --git a/src/main/resources/Translations/Translations_en.properties b/src/main/resources/Translations/Translations_en.properties index b7fd562..3c71039 100644 --- a/src/main/resources/Translations/Translations_en.properties +++ b/src/main/resources/Translations/Translations_en.properties @@ -2,118 +2,119 @@ # @author Skidder / GregTCLTK # -Hadder=Hadder +# +# @author Skidder / GregTCLTK +# -user/id= <@User>/ -searchterm= -username= -number= -guildprefix= -<@User>=<@User> -on/off= -vc-name/id= -user+nickname=<@user> +Hadder = Hadder -error=Error -none=None -success\!=Success\! +searchterm = +username = +number = +guildprefix = +vc-name/id = +user+nickname = <@user> -commands.fun.avatar.success.title=Avatar of -commands.fun.avatar.help.description=Sends the avatar of the specified member. -commands.fun.gif.error.description=Please try again with another term. -commands.fun.gif.help.description=Look for a GIF on Giphy -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.help.description=Sends you a random meme. +error = Error +none = None +success! = Success! -commands.general.about.success.title=Hadder - About -commands.general.about.success.description=Hadder is an open source Discord bot. -commands.general.about.success.field.one.title=Support the Developers -commands.general.about.success.field.one.description=Hadder is completely free for everyone. We would appreciate it you donate some money [here] -commands.general.about.help.description=Shows infos about Hadder -commands.general.equals.string.first.request=Please send me the first String -commands.general.equals.string.second.request=Please send me the second String -commands.general.equals.string.equals.true=Yes\! The first string equals the second string\! -commands.general.equals.string.equals.false=Well yes but actually No. This isn't the same. -commands.general.equals.string.first=First String -commands.general.equals.string.second=Second String -commands.general.equals.string.result=Result -commands.general.equals.help.description=Check if two strings are the same -commands.general.help.error.description=I need the Embed Links Permission to send the Help Menu\! -commands.general.help.help.description=Shows each command or explains its usage -commands.general.help.help.label=[CommandName] -commands.general.invite.success.title=Invite me\! -commands.general.invite.success.description=[Invite me here\!] -commands.general.invite.help.description=Shows the invitation to invite Hadder to your server -commands.general.ping.help.description=Shows the ping to the Discord API +commands.fun.avatar.success.title = Avatar of +commands.fun.avatar.help.description = Sends the avatar of the specified member. +commands.fun.gif.error.description = Please try again with another term. +commands.fun.gif.help.description = Look for a GIF on Giphy +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.help.description = Sends you a random meme. -commands.misc.feedback.title.request.title=Feedback Topic -commands.misc.feedback.title.request.description=Please send me the feedback topic. -commands.misc.feedback.description.request.title=Feedback Description -commands.misc.feedback.description.request.description=Please send me the feedback description now. -commands.misc.feedback.help.description=Sends feedback directly to the developers. -commands.misc.github.link.title=Link your GitHub Account -commands.misc.github.success.title=Information about -commands.misc.github.success.bio=User bio -commands.misc.github.success.location=Location -commands.misc.github.success.website=Website -commands.misc.github.success.repositories=Public repositories -commands.misc.github.success.gists=Public gists -commands.misc.github.success.followers=Followers -commands.misc.github.success.following=Following -commands.misc.github.api.error.description=The GitHub API might be down at the moment\! -commands.misc.github.user.error.description=This user does not exist\! -commands.misc.github.connect.title=Connect you GH account -commands.misc.github.connect.description=Please connect your GitHub account here -commands.misc.github.help.description=Displays information about a GitHub user profile. -commands.misc.screenshare.success.title=Here's your Url to share your Screen -commands.misc.screenshare.id.error.title=Wait that's illegal -commands.misc.screenshare.id.error.description=This ID is invalid. \nMaybe you entered a wrong ID? \n\nNote\: Make sure the Voice Channel is on this Guild. -commands.misc.screenshare.channel.error.title=Please Choose a Voice Channel -commands.misc.screenshare.channel.error.description=There is more than one channel with this name -commands.misc.screenshare.number.error.title=You specified a wrong number\! -commands.misc.screenshare.number.error.description=This isn't a Number. -commands.misc.screenshare.channel.existing.error=Hol' up -commands.misc.screenshare.channel.existing.description=There is no Voice Channel named like this. \n\nNote\: Make sure the Voice Channel is on this Guild. -commands.misc.screenshare.help.description=Shows you the link to share your screen. +commands.general.about.success.title = Hadder - About +commands.general.about.success.description = Hadder is an open source Discord bot. +commands.general.about.success.field.one.title = Support the Developers +commands.general.about.success.field.one.description = Hadder is completely free for everyone. We would appreciate it you donate some money [here] +commands.general.about.help.description = Shows infos about Hadder +commands.general.equals.string.first.request = Please send me the first String +commands.general.equals.string.second.request = Please send me the second String +commands.general.equals.string.equals.true = Yes! The first string equals the second string! +commands.general.equals.string.equals.false = Well yes but actually No. This isn't the same. +commands.general.equals.string.first = First String +commands.general.equals.string.second = Second String +commands.general.equals.string.result = Result +commands.general.equals.help.description = Check if two strings are the same +commands.general.help.error.description = I need the Embed Links Permission to send the Help Menu! +commands.general.help.help.description = Shows each command or explains its usage +commands.general.help.help.label = [CommandName] +commands.general.invite.success.title = Invite me! +commands.general.invite.success.description = [Invite me here!] +commands.general.invite.help.description = Shows the invitation to invite Hadder to your server +commands.general.ping.help.description = Shows the ping to the Discord API -commands.moderation.ban.success.title=Successfully banned -commands.moderation.ban.success.description=I successfully baned -commands.moderation.ban.error.title=Not possible -commands.moderation.ban.myself.error.description=I can not ban myself\! -commands.moderation.ban.yourself.error.description=You can't ban yourself\! -commands.moderation.ban.help.description=Bans one ore more user from the server -commands.moderation.clear.number.error.description=You have to choose a number between 1 and 200\! -commands.moderation.clear.success.description=Successfully deleted 69 messages. -commands.moderation.clear.help.description=Deletes the specified number of messages. -commands.moderation.prefix.success.title=Successfully set -commands.moderation.prefix.success.description=I successfully set the new prefix for the guild to -commands.moderation.prefix.error.description=The prefix must not contain **** -commands.moderation.prefix.help.description=Sets the Guild-Prefix. -commands.moderation.invitedetect.activate.success.title=Successfully activated -commands.moderation.invitedetect.activate.success.description=I successfully activated the invite link detection for this guild. -commands.moderation.invitedetect.activate.error.title=Already activated -commands.moderation.invitedetect.activate.error.description=The invite link detection is already activated on this guild. -commands.moderation.invitedetect.deactivate.success.title=Successfully deactivated -commands.moderation.invitedetect.deactivate.success.description=I successfully deactivated the invite link detection for this guild. -commands.moderation.invitedetect.deactivate.error.title=Already deactivated -commands.moderation.invitedetect.deactivate.error.description=The invite link detection is already deactivated on this guild. -commands.moderation.invitedetect.help.description=Activate or deactivate the Discord invite link detection. -commands.moderation.kick.success.title=Successfully kicked -commands.moderation.kick.success.description=I successfully kicked -commands.moderation.kick.myself.error.description=I can not kick myself\! -commands.moderation.kick.yourself.error.description=You can't kick yourself. -commands.moderation.kick.mass.success.description=I successfully kicked 69 Members\! -commands.moderation.kick.help.description=Kicks one or more user from the server. -commands.moderation.link.request.success.description=If i'm on this guild i sent a message to accept the link. -commands.moderation.link.error.title=Wait that's illegal. -commands.moderation.link.request.error.description=You specified the same guild as the guild on which you're reading this -commands.moderation.link.request.accept.title=Skidder wants to link guilds\! -commands.moderation.link.request.accept.description=React with the reactions to accept or decline it -commands.moderation.link.set.title=Set the thing boi -commands.moderation.link.help.description=Links two or more servers. -commands.moderation.nick.success.title=Successfully nicked -commands.moderation.nick.success.description=I successfully nicked -commands.moderation.nick.myself.success.description=I successfully changed my nickname. -commands.moderation.nick.mass.success.description=I successfully nicked 69 Members\! -commands.moderation.nick.help.description=Rename a one or more user. +commands.misc.feedback.title.request.title = Feedback Topic +commands.misc.feedback.title.request.description = Please send me the feedback topic. +commands.misc.feedback.description.request.title = Feedback Description +commands.misc.feedback.description.request.description = Please send me the feedback description now. +commands.misc.feedback.help.description = Sends feedback directly to the developers. +commands.misc.github.link.title = Link your GitHub Account +commands.misc.github.success.title = Information about +commands.misc.github.success.bio = User bio +commands.misc.github.success.location = Location +commands.misc.github.success.website = Website +commands.misc.github.success.repositories = Public repositories +commands.misc.github.success.gists = Public gists +commands.misc.github.success.followers = Followers +commands.misc.github.success.following = Following +commands.misc.github.api.error.description = The GitHub API might be down at the moment! +commands.misc.github.user.error.description = This user does not exist! +commands.misc.github.connect.title = Connect you GH account +commands.misc.github.connect.description = [Please connect your GitHub account here] +commands.misc.github.help.description = Displays information about a GitHub user profile. +commands.misc.screenshare.success.title = Here's your Url to share your Screen +commands.misc.screenshare.id.error.title = Wait that's illegal +commands.misc.screenshare.id.error.description = This ID is invalid. \nMaybe you entered a wrong ID? \n\nNote: Make sure the Voice Channel is on this Guild. +commands.misc.screenshare.channel.error.title = Please Choose a Voice Channel +commands.misc.screenshare.channel.error.description = There is more than one channel with this name +commands.misc.screenshare.number.error.title = You specified a wrong number! +commands.misc.screenshare.number.error.description = This isn't a Number. +commands.misc.screenshare.channel.existing.error = Hol' up +commands.misc.screenshare.channel.existing.description = There is no Voice Channel named like this. \n\nNote: Make sure the Voice Channel is on this Guild. +commands.misc.screenshare.help.description = Shows you the link to share your screen. + +commands.moderation.ban.success.title = ? Successfully banned ? +commands.moderation.ban.success.description = I successfully baned +commands.moderation.ban.error.title = Not possible +commands.moderation.ban.myself.error.description = I can not ban myself! +commands.moderation.ban.yourself.error.description = You can not ban yourself! +commands.moderation.ban.help.description = Bans one ore more user from the server +commands.moderation.clear.number.error.description = You have to choose a number between 1 and 99! +commands.moderation.clear.success.description = Successfully deleted +commands.moderation.clear.help.description = Deletes the specified number of messages. +commands.moderation.prefix.success.title = ? Successfully set ? +commands.moderation.prefix.success.description = I successfully set the new prefix for the guild to +commands.moderation.prefix.error.description = The prefix must not contain **\"** +commands.moderation.prefix.help.description = Sets the Guild-Prefix. +commands.moderation.invitedetect.activate.success.title = Successfully activated +commands.moderation.invitedetect.activate.success.description = I successfully activated the invite link detection for this guild. +commands.moderation.invitedetect.activate.error.title = Already activated +commands.moderation.invitedetect.activate.error.description = The invite link detection is already activated on this guild. +commands.moderation.invitedetect.deactivate.success.title = Successfully deactivated +commands.moderation.invitedetect.deactivate.success.description = I successfully deactivated the invite link detection for this guild. +commands.moderation.invitedetect.deactivate.error.title = Already deactivated +commands.moderation.invitedetect.deactivate.error.description = The invite link detection is already deactivated on this guild. +commands.moderation.invitedetect.help.description = Activate or deactivate the Discord invite link detection. +commands.moderation.kick.success.title = ? Successfully kicked ? +commands.moderation.kick.success.description = I successfully kicked +commands.moderation.kick.error.title = Not possible +commands.moderation.kick.myself.error.description = I can not kick myself! +commands.moderation.kick.yourself.error.description = You can't kick yourself. +commands.moderation.kick.mass.success.description = I successfully kicked 69 Members! +commands.moderation.kick.help.description = Kicks one or more user from the server. +commands.moderation.link.request.success.description = If i'm on this guild i sent a message to accept the link. +commands.moderation.link.error.title = Wait that's illegal. +commands.moderation.link.request.error.description = You specified the same guild as the guild on which you're reading this +commands.moderation.link.request.accept.title = ) wants to link guilds! +commands.moderation.link.request.accept.description = React with the reactions to accept or decline it +commands.moderation.link.set.title = Set the thing boi +commands.moderation.link.help.description = Links two or more servers. +commands.moderation.nick.success.title = ? Successfully nicked ? +commands.moderation.nick.success.description = I successfully nicked +commands.moderation.nick.myself.success.description = I successfully changed my nickname. +commands.moderation.nick.help.description = Rename a one or more user. \ No newline at end of file