From 6c8456e51fca19a893a3b214344a3796cf4ab6a5 Mon Sep 17 00:00:00 2001 From: GregTCLTK Date: Tue, 10 Dec 2019 20:35:09 +0100 Subject: [PATCH 1/7] Remove git tag --- crowdin.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/crowdin.yml b/crowdin.yml index 981b8c9..23e0216 100644 --- a/crowdin.yml +++ b/crowdin.yml @@ -1,5 +1,5 @@ base_url: 'https://bigbotnetwork.com' -commit_message: '[ci skip] New %language% translation' +commit_message: 'New %language% translation' files: - source: /src/main/resources/Translations/Translations_en.properties translation: /src/main/resources/Translations/Translations_%two_letters_code%.properties -- 2.45.3 From 46bb5109976f57af0d59860e071b010298d15f81 Mon Sep 17 00:00:00 2001 From: GregTCLTK Date: Wed, 11 Dec 2019 17:34:52 +0100 Subject: [PATCH 2/7] %extra% Not by the GottBot --- .../java/com/bbn/hadder/commands/fun/AvatarCommand.java | 6 +++--- src/main/java/com/bbn/hadder/utils/MessageEditor.java | 5 +++++ src/main/resources/Translations/Translations_en.properties | 4 ++-- 3 files changed, 10 insertions(+), 5 deletions(-) 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 88cc91c..cf5813d 100644 --- a/src/main/java/com/bbn/hadder/commands/fun/AvatarCommand.java +++ b/src/main/java/com/bbn/hadder/commands/fun/AvatarCommand.java @@ -16,21 +16,21 @@ public class AvatarCommand implements Command { if (args.length == 0) { Member member = event.getMember(); event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO) - .setTitle(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.fun.avatar.success.title") + 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(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.fun.avatar.success.title") + 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 (args[0].length() == 18){ Member member = event.getGuild().getMemberById(args[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(); diff --git a/src/main/java/com/bbn/hadder/utils/MessageEditor.java b/src/main/java/com/bbn/hadder/utils/MessageEditor.java index b514d6d..db7dc1c 100644 --- a/src/main/java/com/bbn/hadder/utils/MessageEditor.java +++ b/src/main/java/com/bbn/hadder/utils/MessageEditor.java @@ -66,4 +66,9 @@ public class MessageEditor { Locale locale = new Locale(language_code); return ResourceBundle.getBundle("Translations/Translations", locale).getString(string).replaceAll("%prefix%", "h."); } + + public static String handle(String language_code, String string, String extra) { + Locale locale = new Locale(language_code); + return ResourceBundle.getBundle("Translations/Translations", locale).getString(string).replaceAll("%prefix%", "h.").replaceAll("%extra%", extra); + } } diff --git a/src/main/resources/Translations/Translations_en.properties b/src/main/resources/Translations/Translations_en.properties index 3c71039..7a7fc32 100644 --- a/src/main/resources/Translations/Translations_en.properties +++ b/src/main/resources/Translations/Translations_en.properties @@ -19,7 +19,7 @@ error = Error none = None success! = Success! -commands.fun.avatar.success.title = Avatar of +commands.fun.avatar.success.title = Avatar of %extra% 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 @@ -117,4 +117,4 @@ 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 +commands.moderation.nick.help.description = Rename a one or more user. -- 2.45.3 From 5b039ee53240fc362946db39e35c6fab737bf2b6 Mon Sep 17 00:00:00 2001 From: GregTCLTK Date: Wed, 11 Dec 2019 17:58:32 +0100 Subject: [PATCH 3/7] Translation improvements --- .../com/bbn/hadder/commands/fun/GifCommand.java | 2 +- .../bbn/hadder/commands/general/AboutCommand.java | 2 +- .../bbn/hadder/commands/general/HelpCommand.java | 2 +- .../bbn/hadder/commands/general/InviteCommand.java | 2 +- .../bbn/hadder/commands/general/PingCommand.java | 6 +++++- .../bbn/hadder/commands/misc/FeedbackCommand.java | 2 +- .../com/bbn/hadder/commands/misc/GitHubCommand.java | 4 ++-- .../bbn/hadder/commands/moderation/BanCommand.java | 4 ++-- .../Translations/Translations_en.properties | 13 ++++++++----- 9 files changed, 22 insertions(+), 15 deletions(-) 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 0abe35a..4de31b3 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(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.fun.gif.error.description")).build()).queue(); + event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.ERROR).setTitle(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "error")).setDescription(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.fun.gif.error.description")).build()).queue(); } } else event.getHelpCommand().sendHelp(this, event); } 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 2512d2f..2050712 100644 --- a/src/main/java/com/bbn/hadder/commands/general/AboutCommand.java +++ b/src/main/java/com/bbn/hadder/commands/general/AboutCommand.java @@ -15,7 +15,7 @@ public class AboutCommand implements Command { event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO) .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) + .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(); } 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 aeb53b0..14934aa 100644 --- a/src/main/java/com/bbn/hadder/commands/general/HelpCommand.java +++ b/src/main/java/com/bbn/hadder/commands/general/HelpCommand.java @@ -61,7 +61,7 @@ public class HelpCommand implements Command { EmbedBuilder eb = new EmbedBuilder(); String name = cmd.labels()[0]; eb.setDescription(cmd.description()).setTitle(name.replaceFirst(String.valueOf(name.charAt(0)), String.valueOf(name.charAt(0)).toUpperCase())); - eb.addField("Usage", event.getRethink().getUserPrefix(event.getAuthor().getId()) + cmd.labels()[0] + " " + cmd.usage(), false); + eb.addField(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.general.help.field.usage"), event.getRethink().getUserPrefix(event.getAuthor().getId()) + cmd.labels()[0] + " " + cmd.usage(), false); new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO); event.getChannel().sendMessage(eb.build()).queue(); } 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 e761514..7b17bb7 100644 --- a/src/main/java/com/bbn/hadder/commands/general/InviteCommand.java +++ b/src/main/java/com/bbn/hadder/commands/general/InviteCommand.java @@ -15,7 +15,7 @@ public class InviteCommand implements Command { public void executed(String[] args, CommandEvent event) { event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO) .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)") + .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(); } 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 a4b691b..b5e8c01 100644 --- a/src/main/java/com/bbn/hadder/commands/general/PingCommand.java +++ b/src/main/java/com/bbn/hadder/commands/general/PingCommand.java @@ -12,7 +12,11 @@ public class PingCommand implements Command { @Override public void executed(String[] args, CommandEvent event) { - event.getJDA().getRestPing().queue(ping -> event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO).setTitle("Ping").setDescription(String.valueOf(ping)).build()).queue()); + event.getJDA().getRestPing().queue(ping -> event.getTextChannel().sendMessage(new MessageEditor() + .setDefaultSettings(MessageEditor.MessageType.INFO) + .setTitle("Ping") + .setDescription(String.valueOf(ping)) + .build()).queue()); } @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 f677e31..50394a4 100644 --- a/src/main/java/com/bbn/hadder/commands/misc/FeedbackCommand.java +++ b/src/main/java/com/bbn/hadder/commands/misc/FeedbackCommand.java @@ -35,7 +35,7 @@ public class FeedbackCommand implements Command { GHRepository Hadder = connection.getOrganization("BigBotNetwork").getRepository("Hadder"); GHIssue issue = Hadder.createIssue(title).body("Feedback by " + event.getAuthor().getAsTag() + "
" + description).label("feedback").create(); event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO) - .setTitle("Feedback successfully sent") + .setTitle(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.misc.feedback.success.title")) .setDescription(issue.getHtmlUrl().toString()) .build()).queue(); } catch (IOException e) { 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 187c344..8640f1b 100644 --- a/src/main/java/com/bbn/hadder/commands/misc/GitHubCommand.java +++ b/src/main/java/com/bbn/hadder/commands/misc/GitHubCommand.java @@ -45,7 +45,7 @@ public class GitHubCommand implements Command { if (!json.getString("blog").equals("")) website = json.getString("blog"); event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO) - .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") + .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(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) @@ -65,7 +65,7 @@ public class GitHubCommand implements Command { } else { event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO) .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)") + .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(); } } 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 ca68aae..d0ebed3 100644 --- a/src/main/java/com/bbn/hadder/commands/moderation/BanCommand.java +++ b/src/main/java/com/bbn/hadder/commands/moderation/BanCommand.java @@ -21,7 +21,7 @@ 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(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(); + 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(); } @@ -50,7 +50,7 @@ public class BanCommand implements Command { 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(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(); + 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", String.valueOf(event.getMessage().getMentionedMembers().size()))).build()).queue(); } } else { event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.NO_PERMISSION).build()).queue(); diff --git a/src/main/resources/Translations/Translations_en.properties b/src/main/resources/Translations/Translations_en.properties index 7a7fc32..e80664d 100644 --- a/src/main/resources/Translations/Translations_en.properties +++ b/src/main/resources/Translations/Translations_en.properties @@ -30,7 +30,7 @@ commands.fun.meme.help.description = Sends you a random meme. 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.success.field.one.description = Hadder is completely free for everyone. We would appreciate it you donate some money [here]%extra% 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 @@ -40,11 +40,12 @@ 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.field.usage = Usage 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.success.description = [Invite me here!]%extra% 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 @@ -53,8 +54,9 @@ commands.misc.feedback.title.request.description = Please send me the feedback t 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.feedback.success.title = Feedback successfully sent commands.misc.github.link.title = Link your GitHub Account -commands.misc.github.success.title = Information about +commands.misc.github.success.title = Information about %extra% commands.misc.github.success.bio = User bio commands.misc.github.success.location = Location commands.misc.github.success.website = Website @@ -65,7 +67,7 @@ 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.connect.description = [Please connect your GitHub account here]%extra% 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 @@ -79,10 +81,11 @@ commands.misc.screenshare.channel.existing.description = There is no Voice Chann 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.success.description = I successfully baned %extra% 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.massban.success.description = I successfully baned %extra% Members! 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 -- 2.45.3 From 38dfca57678baf12176c406334c5263ef893d545 Mon Sep 17 00:00:00 2001 From: GregTCLTK Date: Wed, 11 Dec 2019 18:29:56 +0100 Subject: [PATCH 4/7] More translation improvements --- .../commands/moderation/BanCommand.java | 4 +-- .../commands/moderation/ClearCommand.java | 2 +- .../moderation/GuildPrefixCommand.java | 2 +- .../commands/moderation/KickCommand.java | 4 +-- .../commands/moderation/NickCommand.java | 10 ++++---- .../moderation/RegionChangeCommand.java | 12 ++++----- .../Translations/Translations_en.properties | 25 ++++++++++++------- 7 files changed, 33 insertions(+), 26 deletions(-) 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 d0ebed3..2d1e831 100644 --- a/src/main/java/com/bbn/hadder/commands/moderation/BanCommand.java +++ b/src/main/java/com/bbn/hadder/commands/moderation/BanCommand.java @@ -21,7 +21,7 @@ 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(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(); + 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(); } @@ -50,7 +50,7 @@ public class BanCommand implements Command { 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(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", String.valueOf(event.getMessage().getMentionedMembers().size()))).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.massban.success.description", String.valueOf(event.getMessage().getMentionedMembers().size()))).build()).queue(); } } else { event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.NO_PERMISSION).build()).queue(); 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 3138c18..d19ea55 100644 --- a/src/main/java/com/bbn/hadder/commands/moderation/ClearCommand.java +++ b/src/main/java/com/bbn/hadder/commands/moderation/ClearCommand.java @@ -32,7 +32,7 @@ public class ClearCommand implements Command { List msgToDelete = new ArrayList<>(); msgToDelete.addAll(history); event.getTextChannel().deleteMessages(msgToDelete).queue(); - 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(); + 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", String.valueOf(nbToDelete))).build()).complete(); try { TimeUnit.SECONDS.sleep(2); } catch (InterruptedException e) { 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 329b1fe..b978d95 100644 --- a/src/main/java/com/bbn/hadder/commands/moderation/GuildPrefixCommand.java +++ b/src/main/java/com/bbn/hadder/commands/moderation/GuildPrefixCommand.java @@ -14,7 +14,7 @@ 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(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(); + 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(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.moderation.prefix.error.description")).build()).queue(); } 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 5a51f7e..31a2e8a 100644 --- a/src/main/java/com/bbn/hadder/commands/moderation/KickCommand.java +++ b/src/main/java/com/bbn/hadder/commands/moderation/KickCommand.java @@ -22,7 +22,7 @@ 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(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(); + 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(); } @@ -51,7 +51,7 @@ public class KickCommand implements Command { 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(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(); + 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.masskick.success.description", String.valueOf(event.getMessage().getMentionedMembers().size()))).build()).queue(); } } } 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 6ec0fce..1e4d45d 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(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(); + 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(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(); + 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(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(); + 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(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(); + 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(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(); + 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", String.valueOf(event.getMessage().getMentionedMembers().size()))).build()).queue(); } } else { event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.NO_SELF_PERMISSION).build()).queue(); diff --git a/src/main/java/com/bbn/hadder/commands/moderation/RegionChangeCommand.java b/src/main/java/com/bbn/hadder/commands/moderation/RegionChangeCommand.java index db283fe..e196b5a 100644 --- a/src/main/java/com/bbn/hadder/commands/moderation/RegionChangeCommand.java +++ b/src/main/java/com/bbn/hadder/commands/moderation/RegionChangeCommand.java @@ -74,7 +74,7 @@ public class RegionChangeCommand implements Command { break; case "list": event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO) - .setTitle("All regions") + .setTitle(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.moderation.regionchange.regions.title")) .setDescription("**LOCKED:**\n`amsterdam` `frankfurt` `eu-west` `eu-central` `london`\n\n**UNLOCKED:**\n`europe` `brazil` `hongkong` `india` `japan` `singapore` `south-africa` `sydney` `us-central` `us-east` `us-west` `us-south`") .build()).queue(); break; @@ -82,7 +82,7 @@ public class RegionChangeCommand implements Command { } else event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.NO_PERMISSION).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.INFO) - .setTitle("All regions") + .setTitle(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.moderation.regionchange.regions.title")) .setDescription("**LOCKED:**\n`amsterdam` `frankfurt` `eu-west` `eu-central` `london`\n\n**UNLOCKED:**\n`europe` `brazil` `hongkong` `india` `japan` `singapore` `south-africa` `sydney` `us-central` `us-east` `us-west` `us-south`") .build()).queue(); } @@ -90,8 +90,8 @@ public class RegionChangeCommand implements Command { public void setRegion (Region region, String region_name, CommandEvent event) { event.getGuild().getManager().setRegion(region).reason("Region changed by " + event.getAuthor().getAsTag()).queue(); event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO) - .setTitle("Successfully set region") - .setDescription("I successfully set the new server region to " + region_name + ".") + .setTitle(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.moderation.regionchange.success.title")) + .setDescription(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.moderation.regionchange.success.description", region_name)) .build()).queue(); } @@ -102,11 +102,11 @@ public class RegionChangeCommand implements Command { @Override public String description() { - return "Changes the server region to locked regions."; + return MessageEditor.handle("en", "commands.moderation.regionchange.help.description"); } @Override public String usage() { - return ""; + return MessageEditor.handle("en", "region"); } } diff --git a/src/main/resources/Translations/Translations_en.properties b/src/main/resources/Translations/Translations_en.properties index e80664d..b2e14d2 100644 --- a/src/main/resources/Translations/Translations_en.properties +++ b/src/main/resources/Translations/Translations_en.properties @@ -14,6 +14,7 @@ number = guildprefix = vc-name/id = user+nickname = <@user> +region = error = Error none = None @@ -80,18 +81,18 @@ 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.title = %extra% Successfully banned %extra% commands.moderation.ban.success.description = I successfully baned %extra% 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.massban.success.description = I successfully baned %extra% Members! +commands.moderation.ban.massban.success.description = I successfully baned %extra% Members! 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.success.description = Successfully deleted %extra% 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.success.title = %extra% Successfully set %extra% +commands.moderation.prefix.success.description = I successfully set the new prefix for the guild to %extra% 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 @@ -103,13 +104,14 @@ commands.moderation.invitedetect.deactivate.success.description = I successfully 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.success.title = %extra% Successfully kicked %extra% +commands.moderation.kick.success.description = I successfully kicked %extra%. 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.kick.masskick.success.description = I successfully kicked %extra% members. 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 @@ -117,7 +119,12 @@ 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.success.title = %extra% Successfully nicked %extra% +commands.moderation.nick.success.description = I successfully nicked %extra%. commands.moderation.nick.myself.success.description = I successfully changed my nickname. +commands.moderation.nick.massnick.success.description = I successfully nicked %extra% Members. commands.moderation.nick.help.description = Rename a one or more user. +commands.moderation.regionchange.regions.title = All regions +commands.moderation.regionchange.success.title = Successfully set region +commands.moderation.regionchange.success.description = I successfully set the new server region to %extra%. +commands.moderation.regionchange.help.description = Changes the server region to locked regions. -- 2.45.3 From d2fb3a96ff36887555042f626e3d25dba0d91d47 Mon Sep 17 00:00:00 2001 From: GregTCLTK Date: Wed, 11 Dec 2019 19:25:38 +0100 Subject: [PATCH 5/7] :thinking: --- src/main/java/com/bbn/hadder/commands/owner/EvalCommand.java | 1 + 1 file changed, 1 insertion(+) 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 c18964f..d2e9894 100644 --- a/src/main/java/com/bbn/hadder/commands/owner/EvalCommand.java +++ b/src/main/java/com/bbn/hadder/commands/owner/EvalCommand.java @@ -41,6 +41,7 @@ public class EvalCommand implements Command { engine.put("author", event.getAuthor()); engine.put("member", event.getMember()); engine.put("self", event.getGuild().getSelfMember()); + engine.put("System.out", System.out); ScheduledExecutorService service = Executors.newScheduledThreadPool(1); -- 2.45.3 From 6649f0b0928c86b934f6788afe7d500335c3f366 Mon Sep 17 00:00:00 2001 From: GregTCLTK Date: Wed, 11 Dec 2019 19:43:08 +0100 Subject: [PATCH 6/7] Translation for Role and Rules command --- .../commands/moderation/RoleCommand.java | 10 +-- .../commands/moderation/RulesCommand.java | 66 +++++++++---------- .../com/bbn/hadder/utils/MessageEditor.java | 5 ++ .../Translations/Translations_en.properties | 29 ++++++++ 4 files changed, 72 insertions(+), 38 deletions(-) diff --git a/src/main/java/com/bbn/hadder/commands/moderation/RoleCommand.java b/src/main/java/com/bbn/hadder/commands/moderation/RoleCommand.java index 3da7135..1097dd0 100644 --- a/src/main/java/com/bbn/hadder/commands/moderation/RoleCommand.java +++ b/src/main/java/com/bbn/hadder/commands/moderation/RoleCommand.java @@ -32,8 +32,8 @@ public class RoleCommand implements Command { } } event.getChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO) - .setTitle("✅ Successfully added role(s) ✅") - .setDescription("I successfully added " + event.getMessage().getMentionedRoles().size() + " roles to " + event.getMessage().getMentionedMembers().size() + " members.") + .setTitle(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.moderation.role.add.success.title", "✅")) + .setDescription(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.moderation.role.add.success.description", String.valueOf(event.getMessage().getMentionedRoles().size()), String.valueOf(event.getMessage().getMentionedMembers().size()))) .build()).queue(); } break; @@ -54,8 +54,8 @@ public class RoleCommand implements Command { } } event.getChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO) - .setTitle("✅ Successfully removed role(s) ✅") - .setDescription("I successfully removed " + event.getMessage().getMentionedRoles().size() + " roles from " + event.getMessage().getMentionedMembers().size() + " members.") + .setTitle(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.moderation.role.remove.success.title", "✅")) + .setDescription(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.moderation.role.remove.success.description", String.valueOf(event.getMessage().getMentionedRoles().size()), String.valueOf(event.getMessage().getMentionedMembers().size()))) .build()).queue(); } break; @@ -78,7 +78,7 @@ public class RoleCommand implements Command { @Override public String description() { - return "Adds and removes roles from one or more user"; + return MessageEditor.handle("en", "commands.moderation.role.help.description"); } @Override diff --git a/src/main/java/com/bbn/hadder/commands/moderation/RulesCommand.java b/src/main/java/com/bbn/hadder/commands/moderation/RulesCommand.java index 063a97c..5f08a8d 100644 --- a/src/main/java/com/bbn/hadder/commands/moderation/RulesCommand.java +++ b/src/main/java/com/bbn/hadder/commands/moderation/RulesCommand.java @@ -22,8 +22,8 @@ public class RulesCommand implements Command { if (event.getMember().hasPermission(Permission.MANAGE_SERVER) || event.getConfig().getOwners().toString().contains(event.getAuthor().getId())) { if (event.getGuild().getSelfMember().hasPermission(Permission.MANAGE_ROLES)) { event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO) - .setTitle("Set up rules") - .setDescription("Welcome to the Hadder rules setup. Please mention the channel in which I should send the rules. Your message should look like: #rules or #verify.") + .setTitle(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.moderation.rules.setup.title")) + .setDescription(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.moderation.rules.setup.description")) .build()).queue(); new EventWaiter().newOnMessageEventWaiter(event1 -> { if (event1.getMessage().getMentionedChannels().size() == 1) { @@ -32,8 +32,8 @@ public class RulesCommand implements Command { createRules(event, event1, channel); } catch (Exception e) { event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.ERROR) - .setTitle("Channel not found") - .setDescription("I can't find the specified channel. Please start the setup again.") + .setTitle(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.moderation.rules.channel.error.title")) + .setDescription(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.moderation.rules.channel.error.description")) .build()).queue(); } } else { @@ -42,8 +42,8 @@ public class RulesCommand implements Command { createRules(event, event1, channel); } catch (Exception e) { event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.ERROR) - .setTitle("Channel not found") - .setDescription("I can't find the specified channel. Please start the setup again.") + .setTitle(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.moderation.rules.channel.error.title")) + .setDescription(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.moderation.rules.channel.error.description")) .build()).queue(); } } @@ -60,14 +60,14 @@ public class RulesCommand implements Command { if (channel.getGuild().getId().equals(event1.getGuild().getId())) { if (event.getGuild().getSelfMember().hasPermission(channel, Permission.MESSAGE_WRITE)) { event1.getChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO) - .setTitle("Rules") - .setDescription("The channel was successfully set to " + channel.getName() + ". Please send me the rules now.") + .setTitle(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.moderation.rules.rules.title")) + .setDescription(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.moderation.rules.rules.title", channel.getName())) .build()).queue(); new EventWaiter().newOnMessageEventWaiter(event2 -> { String message = event2.getMessage().getContentRaw(); event2.getChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO) - .setTitle("Role to assign") - .setDescription("The rules were successfully set. Please send me the name of the role which the user receives after he accepted the rules.") + .setTitle(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.moderation.rules.role.title")) + .setDescription(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.moderation.rules.role.description")) .build()).queue(); new EventWaiter().newOnMessageEventWaiter(event3 -> { if (event3.getMessage().getMentionedRoles().size() == 1) { @@ -78,8 +78,8 @@ public class RulesCommand implements Command { setRole(event, channel, message, event3, role); } else { event3.getChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.WARNING) - .setTitle("Role does not exist") - .setDescription("The specified role does not exist on this guild.") + .setTitle(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.moderation.rules.role.error.title")) + .setDescription(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.moderation.rules.role.error.description")) .build()).queue(); } }, event.getJDA(), event.getAuthor()); @@ -90,8 +90,8 @@ public class RulesCommand implements Command { } } else { event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.WARNING) - .setTitle("Wrong Guild") - .setDescription("The mentioned channel must be on this guid!") + .setTitle(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.moderation.rules.guild.error.title")) + .setDescription(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.moderation.rules.guild.error.description")) .build()).queue(); } } @@ -99,15 +99,15 @@ public class RulesCommand implements Command { public void setRole(CommandEvent event, TextChannel channel, String message, GuildMessageReceivedEvent event3, Role role) { if (event3.getGuild().getSelfMember().canInteract(role)) { event3.getChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO) - .setTitle("Custom Accept Emote") - .setDescription("The role has been successfully set to " + role.getName() + ". Now send me the emote on which your user should react to to get verified.") + .setTitle(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.moderation.rules.emote.accept.title")) + .setDescription(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.moderation.rules.emote.accept.description", role.getName())) .build()).queue(); new EventWaiter().newOnMessageEventWaiter(event4 -> { if (event4.getMessage().getEmotes().size() == 1) { Emote aemote = event4.getMessage().getEmotes().get(0); event4.getChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO) - .setTitle("Custom Decline Emote") - .setDescription("The first emote has been successfully set to " + aemote + ". Please send me now the decline emote.") + .setTitle(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.moderation.rules.emote.decline.title")) + .setDescription(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.moderation.rules.emote.decline.title", String.valueOf(aemote))) .build()).queue(); new EventWaiter().newOnMessageEventWaiter(event5 -> { Emote demote = event5.getMessage().getEmotes().get(0); @@ -120,29 +120,29 @@ public class RulesCommand implements Command { rules.addReaction(aemote).queue(); rules.addReaction(demote).queue(); event5.getChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO) - .setTitle("Successfully set the rules") - .setDescription("I successfully send the rules in " + channel.getAsMention() + ".") + .setTitle(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.moderation.rules.success.title")) + .setDescription(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.moderation.rules.success.description", channel.getAsMention())) .build()).queue(); } catch (Exception e) { event5.getChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.ERROR) - .setTitle("Error") - .setDescription("I can not access the custom emote(s),") + .setTitle(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "error")) + .setDescription(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.moderation.rules.emote.error.access.description")) .build()).queue(); e.printStackTrace(); } event.getRethink().updateRules(event.getGuild().getId(), rules.getId(), role.getId(), aemote.toString(), demote.toString()); } else { event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.WARNING) - .setTitle("Emotes are equal") - .setDescription("The 1st and 2nd emote equals each other.") + .setTitle(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.moderation.rules.emote.error.equal.title")) + .setDescription(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.moderation.rules.emote.error.equal.description")) .build()).queue(); } }, event.getJDA(), event.getAuthor()); } else { String aemote = event4.getMessage().getContentRaw(); event4.getChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO) - .setTitle("Custom Decline Emote") - .setDescription("The first emote has been successfully set. Please send me now the decline emote.") + .setTitle(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.moderation.rules.emote.decline.title")) + .setDescription(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.moderation.rules.emoji.decline.description")) .build()).queue(); new EventWaiter().newOnMessageEventWaiter(event5 -> { String demote = event5.getMessage().getContentRaw(); @@ -155,21 +155,21 @@ public class RulesCommand implements Command { rules.addReaction(aemote).queue(); rules.addReaction(demote).queue(); event5.getChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO) - .setTitle("Successfully set the rules") - .setDescription("I successfully send the rules in " + channel.getAsMention() + ".") + .setTitle(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.moderation.rules.success.title")) + .setDescription(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.moderation.rules.success.description", channel.getAsMention())) .build()).queue(); } catch (Exception e) { event5.getChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.ERROR) - .setTitle("Error") - .setDescription("The given emote can't be used.") + .setTitle(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "error")) + .setDescription(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.moderation.rules.emoji.error.description")) .build()).queue(); e.printStackTrace(); } event.getRethink().updateRules(event.getGuild().getId(), rules.getId(), role.getId(), aemote, demote); } else { event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.WARNING) - .setTitle("Emotes are equal") - .setDescription("The 1st and 2nd emote equals each other.") + .setTitle(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.moderation.rules.emote.error.equal.title")) + .setDescription(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.moderation.rules.emote.error.equal.description")) .build()).queue(); } }, event.getJDA(), event.getAuthor()); @@ -187,7 +187,7 @@ public class RulesCommand implements Command { @Override public String description() { - return "Setup the rules on your Discord server"; + return MessageEditor.handle("en", "commands.moderation.rules.help.description"); } @Override diff --git a/src/main/java/com/bbn/hadder/utils/MessageEditor.java b/src/main/java/com/bbn/hadder/utils/MessageEditor.java index db7dc1c..ece4949 100644 --- a/src/main/java/com/bbn/hadder/utils/MessageEditor.java +++ b/src/main/java/com/bbn/hadder/utils/MessageEditor.java @@ -71,4 +71,9 @@ public class MessageEditor { Locale locale = new Locale(language_code); return ResourceBundle.getBundle("Translations/Translations", locale).getString(string).replaceAll("%prefix%", "h.").replaceAll("%extra%", extra); } + + public static String handle(String language_code, String string, String extra, String extra_two) { + Locale locale = new Locale(language_code); + return ResourceBundle.getBundle("Translations/Translations", locale).getString(string).replaceAll("%prefix%", "h.").replaceAll("%extra%", extra).replaceAll("%extra_two%", extra_two); + } } diff --git a/src/main/resources/Translations/Translations_en.properties b/src/main/resources/Translations/Translations_en.properties index b2e14d2..4d9d154 100644 --- a/src/main/resources/Translations/Translations_en.properties +++ b/src/main/resources/Translations/Translations_en.properties @@ -128,3 +128,32 @@ commands.moderation.regionchange.regions.title = All regions commands.moderation.regionchange.success.title = Successfully set region commands.moderation.regionchange.success.description = I successfully set the new server region to %extra%. commands.moderation.regionchange.help.description = Changes the server region to locked regions. +commands.moderation.role.add.success.title = %extra% Successfully added role(s) %extra% +commands.moderation.role.add.success.description = I successfully added %extra% roles to %extra_two% members. +commands.moderation.role.remove.success.title = %extra% Successfully removed role(s) %extra% +commands.moderation.role.remove.success.description = I successfully removed %extra% roles from %extra_two% members. +commands.moderation.role.help.description = Adds and removes one or more role(s) from one or more user(s) +commands.moderation.rules.setup.title = Set up rules +commands.moderation.rules.setup.description = Welcome to the Hadder rules setup. Please mention the channel in which I should send the rules. Your message should look like: #rules or #verify. +commands.moderation.rules.channel.error.title = Channel not found +commands.moderation.rules.channel.error.description = I can't find the specified channel. Please start the setup again. +commands.moderation.rules.rules.title = Rules +commands.moderation.rules.rules.description = The channel was successfully set to %extra%. Please send me the rules now. +commands.moderation.rules.role.title = Role to assign +commands.moderation.rules.role.description = The rules were successfully set. Please send me the name of the role which the user receives after he accepted the rules. +commands.moderation.rules.role.error.title = Role does not exist +commands.moderation.rules.role.error.description = The specified role does not exist on this guild. +commands.moderation.rules.guild.error.title = Wrong Guild +commands.moderation.rules.guild.error.description = The mentioned channel must be on this guild! +commands.moderation.rules.emote.accept.title = Custom Accept Emote +commands.moderation.rules.emote.accept.description = The role has been successfully set to %extra%. Now send me the emote on which your user should react to to get verified. +commands.moderation.rules.emote.decline.title = Custom Decline Emote +commands.moderation.rules.emote.decline.description = The first emote has been successfully set to %extra%. Please send me now the decline emote. +commands.moderation.rules.success.title = Successfully set the rules +commands.moderation.rules.success.description = I successfully send the rules in %extra%. +commands.moderation.rules.emote.error.access.description = I can not access the custom emote(s). +commands.moderation.rules.emote.error.equal.title = Emotes are equal +commands.moderation.rules.emote.error.equal.description = The 1st and 2nd emote equals each other. +commands.moderation.rules.emoji.decline.description = The first emote has been successfully set. Please send me now the decline emote. +commands.moderation.rules.emoji.error.description = The given emote can't be used. +commands.moderation.rules.help.description = Setup the rules on your Discord server -- 2.45.3 From 6bb0a77db62af3f08d12ea9e9de2ad41f5a9fe93 Mon Sep 17 00:00:00 2001 From: GregTCLTK Date: Wed, 11 Dec 2019 20:08:08 +0100 Subject: [PATCH 7/7] Music part 1 --- src/main/java/com/bbn/hadder/commands/music/JoinCommand.java | 4 ++-- src/main/resources/Translations/Translations_en.properties | 3 +++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/bbn/hadder/commands/music/JoinCommand.java b/src/main/java/com/bbn/hadder/commands/music/JoinCommand.java index 7caf2ca..a4f28ad 100644 --- a/src/main/java/com/bbn/hadder/commands/music/JoinCommand.java +++ b/src/main/java/com/bbn/hadder/commands/music/JoinCommand.java @@ -23,8 +23,8 @@ public class JoinCommand implements Command { if (!event.getGuild().getSelfMember().getVoiceState().getChannel().getId().equals(vc.getId())) { event.getGuild().getAudioManager().openAudioConnection(vc); event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO) - .setTitle("Successfully connected") - .setDescription("I successfully connected to " + vc.getName() + ".") + .setTitle(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.music.join.success.title")) + .setDescription(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.music.join.success.description", vc.getName())) .build()).queue(); } else { event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.WARNING) diff --git a/src/main/resources/Translations/Translations_en.properties b/src/main/resources/Translations/Translations_en.properties index 4d9d154..e233a20 100644 --- a/src/main/resources/Translations/Translations_en.properties +++ b/src/main/resources/Translations/Translations_en.properties @@ -157,3 +157,6 @@ commands.moderation.rules.emote.error.equal.description = The 1st and 2nd emote commands.moderation.rules.emoji.decline.description = The first emote has been successfully set. Please send me now the decline emote. commands.moderation.rules.emoji.error.description = The given emote can't be used. commands.moderation.rules.help.description = Setup the rules on your Discord server + +commands.music.join.success.title = Successfully connected +commands.music.join.success.description = I successfully connected to %extra%. -- 2.45.3