More translation improvements

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();

src/main/java/com/bbn/hadder/commands/moderation/ClearCommand.java

@@ -32,7 +32,7 @@ public class ClearCommand implements Command {
                         List<Message> 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) {

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();
                 }

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();
             }
         }
     }

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();

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")
+                .setTitle(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.moderation.regionchange.success.title"))
-                .setDescription("I successfully set the new server region to " + region_name + ".")
+                .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 "<region>";
+        return MessageEditor.handle("en", "region");
     }
 }

src/main/resources/Translations/Translations_en.properties

@@ -14,6 +14,7 @@ number = <Number>
 guildprefix = <New Guild-Prefix>
 vc-name/id = <VoiceChannelID|VoiceChannelName>
 user+nickname = <@user> <New Nickname>
+region = <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.title = %extra% Successfully set %extra%
-commands.moderation.prefix.success.description = I successfully set the new prefix for the guild to 
+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.title = %extra% Successfully kicked %extra%
-commands.moderation.kick.success.description = I successfully kicked 
+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.title = %extra% Successfully nicked %extra%
-commands.moderation.nick.success.description = I successfully nicked 
+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.