diff --git a/src/main/java/net/Broken/Tools/AntiSpam.java b/src/main/java/net/Broken/Tools/AntiSpam.java index 1797cf2..c7780fd 100644 --- a/src/main/java/net/Broken/Tools/AntiSpam.java +++ b/src/main/java/net/Broken/Tools/AntiSpam.java @@ -64,7 +64,7 @@ public class AntiSpam { else MainBot.spamUtils.get(user).setMultip(1); - logger.info("Punition de "+user.getEffectiveName()+" avec un multiplicateur de "+MainBot.spamUtils.get(user)); + logger.info("Starting protocol 66 on "+user.getEffectiveName()+" with a multiplicator of "+MainBot.spamUtils.get(user)); if(!MainBot.spamUtils.get(user).isOnSpam()) { @@ -77,7 +77,7 @@ public class AntiSpam { MainBot.spamUtils.get(user).setMinuteur(new Minuteur(MainBot.spamUtils.get(user).getMultip(), move.user, move.saveRoleUser, move.serveur, move.serveurManager,event)); MainBot.spamUtils.get(user).launchMinuteur(); }catch (HierarchyException e){ - Message rest = event.getTextChannel().sendMessage(EmbedMessageUtils.getMoveError("Impossible de déplacer un "+user.getRoles().get(0).getAsMention())).complete(); + Message rest = event.getTextChannel().sendMessage(EmbedMessageUtils.getMoveError("You cannot move a "+user.getRoles().get(0).getAsMention())).complete(); List messages = new ArrayList(){{ add(rest); add(event.getMessage()); @@ -129,7 +129,7 @@ public class AntiSpam { @Override public void run() { - logger.info("["+user.getEffectiveName()+"] Démarage pour "+multip+"min"); + logger.info("["+user.getEffectiveName()+"] Start for "+multip+"min"); while (MainBot.spamUtils.get(user).isOnSpam()) { try { @@ -143,11 +143,11 @@ public class AntiSpam { } timeLeft--; } - logger.info("["+user.getEffectiveName()+"] Fin de spam pour "+user.getEffectiveName()+" apres "+multip+"min."); + logger.info("["+user.getEffectiveName()+"] End of spam for "+user.getEffectiveName()+" after "+multip+"min."); try { move.exc(user, saveRoleUser, true, serveur, serveurManager); //aSaveroleUser=saveRoleUser.get(i) }catch (HierarchyException e){ - Message rest = event.getTextChannel().sendMessage(EmbedMessageUtils.getMoveError("Impossible de déplacer un "+user.getRoles().get(0).getAsMention())).complete(); + Message rest = event.getTextChannel().sendMessage(EmbedMessageUtils.getMoveError("You cannot move "+user.getRoles().get(0).getAsMention())).complete(); List messages = new ArrayList(){{ add(rest); add(event.getMessage()); @@ -155,7 +155,7 @@ public class AntiSpam { new MessageTimeOut(messages,MainBot.messageTimeOut).start(); logger.error("Hierarchy error"); } - logger.info("["+user.getEffectiveName()+"] Fin des "+multip+"min"); + logger.info("["+user.getEffectiveName()+"] End for "+multip+"min"); new MessageTimeOut(new ArrayList<>(MainBot.spamUtils.get(user).getMessages()),0).start(); MainBot.spamUtils.get(user).clearAndAdd(chanel.sendMessage(EmbedMessageUtils.getSpamPardon(user)).complete()); new MessageTimeOut(MainBot.spamUtils.get(user).getMessages(),60).start(); diff --git a/src/main/java/net/Broken/Tools/Command/CommandLoader.java b/src/main/java/net/Broken/Tools/Command/CommandLoader.java index 1086e65..57b4e11 100644 --- a/src/main/java/net/Broken/Tools/Command/CommandLoader.java +++ b/src/main/java/net/Broken/Tools/Command/CommandLoader.java @@ -39,7 +39,7 @@ public class CommandLoader { logger.info("..." + name); if (command.isAnnotationPresent(NoDev.class) && MainBot.dev) { - logger.warn("Command disable in dev mode"); + logger.warn("Command disabled in dev mode"); }else{ try { MainBot.commandes.put(name, command.newInstance()); diff --git a/src/main/java/net/Broken/Tools/Command/CommandParser.java b/src/main/java/net/Broken/Tools/Command/CommandParser.java index 1918344..4d3a174 100644 --- a/src/main/java/net/Broken/Tools/Command/CommandParser.java +++ b/src/main/java/net/Broken/Tools/Command/CommandParser.java @@ -41,7 +41,7 @@ public class CommandParser { - logger.info("Auteur: "+e.getAuthor().getName()+", Commande: "+commande+", args: "+ Arrays.toString(args)); + logger.info("Author: "+e.getAuthor().getName()+", Command: "+commande+", args: "+ Arrays.toString(args)); return new CommandContainer(brut, sansTete, splitSansTete, commande, args, e); diff --git a/src/main/java/net/Broken/Tools/DayListener/Listeners/DailyMadame.java b/src/main/java/net/Broken/Tools/DayListener/Listeners/DailyMadame.java index 20e056e..2d0ad80 100644 --- a/src/main/java/net/Broken/Tools/DayListener/Listeners/DailyMadame.java +++ b/src/main/java/net/Broken/Tools/DayListener/Listeners/DailyMadame.java @@ -73,7 +73,7 @@ public class DailyMadame implements NewDayListener{ } if(chanel != null){ - chanel.sendMessage("Le Daily Madame mes petits cochons :kissing_heart: \n" + imgUrl).queue(); + chanel.sendMessage("Madame of the day :kissing_heart: \n" + imgUrl).queue(); } diff --git a/src/main/java/net/Broken/Tools/EmbedMessageUtils.java b/src/main/java/net/Broken/Tools/EmbedMessageUtils.java index 8215cfa..46336c9 100644 --- a/src/main/java/net/Broken/Tools/EmbedMessageUtils.java +++ b/src/main/java/net/Broken/Tools/EmbedMessageUtils.java @@ -50,7 +50,7 @@ public class EmbedMessageUtils { } public static MessageEmbed getSpamPardon(Member autor) { - return new EmbedBuilder().setTitle(":mute: Spam Hunter :mute:").setDescription(autor.getAsMention() + " is back retour, watch out!\nI'm watching you!").setImage("https://media.giphy.com/media/3o7TKwBctlv08kY08M/giphy.gif").setFooter("Spam info available with '//spaminfo' in private.", MainBot.jda.getSelfUser().getAvatarUrl()).setTimestamp(Instant.now()).setColor(Color.orange).build(); + return new EmbedBuilder().setTitle(":mute: Spam Hunter :mute:").setDescription(autor.getAsMention() + " is back , watch out!\nI'm watching you!").setImage("https://media.giphy.com/media/3o7TKwBctlv08kY08M/giphy.gif").setFooter("Spam info available with '//spaminfo' in private.", MainBot.jda.getSelfUser().getAvatarUrl()).setTimestamp(Instant.now()).setColor(Color.orange).build(); } public static MessageEmbed getHelp(String command) throws FileNotFoundException { diff --git a/src/main/java/net/Broken/Tools/MessageTimeOut.java b/src/main/java/net/Broken/Tools/MessageTimeOut.java index a641ce1..dd806eb 100644 --- a/src/main/java/net/Broken/Tools/MessageTimeOut.java +++ b/src/main/java/net/Broken/Tools/MessageTimeOut.java @@ -37,7 +37,7 @@ public class MessageTimeOut extends Thread{ e.printStackTrace(); } } - logger.debug("Timiout! Deleting message!"); + logger.debug("Time out! Deleting message!"); for(Message aMessage: messages) { try { diff --git a/src/main/java/net/Broken/Tools/Moderateur.java b/src/main/java/net/Broken/Tools/Moderateur.java index 7da5190..5cfb58a 100644 --- a/src/main/java/net/Broken/Tools/Moderateur.java +++ b/src/main/java/net/Broken/Tools/Moderateur.java @@ -76,7 +76,7 @@ public class Moderateur { } if(equalCont >= nbMessage){ spam = 1; - logger.info("Detection de spam pour "+user.getEffectiveName()+"avec 3 messages identique: "); + logger.info("Spam detected for "+user.getEffectiveName()+"with 3 identical messages : "); for(Message aMessage : thisUserHistory) { logger.info("\t - "+aMessage.getContentRaw()); @@ -113,7 +113,7 @@ public class Moderateur { if(cpt > 5){ MainBot.message_compteur.put(user,0); spam = 1; - logger.info("Detection de spam pour "+user.getEffectiveName()+"avec 5 message en 5seg: "); + logger.info("Spam detected for "+user.getEffectiveName()+"with 5 messages in 5 secondes: "); ArrayList histo = MainBot.historique.get(user); for (Message aMessage:histo ) { diff --git a/src/main/java/net/Broken/Tools/UserManager/Stats/UserStatsUtils.java b/src/main/java/net/Broken/Tools/UserManager/Stats/UserStatsUtils.java index 1313979..f834673 100644 --- a/src/main/java/net/Broken/Tools/UserManager/Stats/UserStatsUtils.java +++ b/src/main/java/net/Broken/Tools/UserManager/Stats/UserStatsUtils.java @@ -78,7 +78,7 @@ public class UserStatsUtils { for(Guild guid : user.getMutualGuilds()){ logger.debug(guid.getName()); if(!guildStat.contains(guid.getId())){ - logger.debug("Guild " + guid.getName() + " stat don't exist"); + logger.debug("Guild " + guid.getName() + " stats don't exist"); stats.add(new UserStats(guid.getId(), userEntity)); } } diff --git a/src/main/java/net/Broken/Tools/UserManager/UserUtils.java b/src/main/java/net/Broken/Tools/UserManager/UserUtils.java index 657d64c..8e4ea2d 100644 --- a/src/main/java/net/Broken/Tools/UserManager/UserUtils.java +++ b/src/main/java/net/Broken/Tools/UserManager/UserUtils.java @@ -83,7 +83,7 @@ public class UserUtils { pendingUserEntity = thisUser; token = thisUser.getCheckToken(); }else{ - logger.warn("Password Not Match!"); + logger.warn("Password don't match!"); throw new PasswordNotMatchException(); } } diff --git a/src/main/java/net/Broken/audio/AudioM.java b/src/main/java/net/Broken/audio/AudioM.java index 2f05a61..e430b63 100644 --- a/src/main/java/net/Broken/audio/AudioM.java +++ b/src/main/java/net/Broken/audio/AudioM.java @@ -117,7 +117,7 @@ public class AudioM { @Override public void loadFailed(FriendlyException exception) { - logger.error("Cant load media!"); + logger.error("Can't load media!"); logger.error(exception.getMessage()); event.getTextChannel().sendMessage(EmbedMessageUtils.getMusicError("Playback error !")).queue(); }