Merge pull request 'More multilingual transfer' (#146) from moreMultiLingual into master

Reviewed-by: YoyoNow <jwsteam@nidido.de>

src/de/steamwar/bungeecore/commands/AlertCommand.java

@@ -20,6 +20,7 @@
 package de.steamwar.bungeecore.commands;
 
 import de.steamwar.bungeecore.BungeeCore;
+import de.steamwar.bungeecore.Message;
 import net.md_5.bungee.api.ChatColor;
 import net.md_5.bungee.api.CommandSender;
 
@@ -32,17 +33,10 @@ public class AlertCommand extends BasicCommand {
     @Override
     public void execute(CommandSender sender, String[] args) {
         if(args.length == 0){
-            BungeeCore.send(sender, BungeeCore.CHAT_PREFIX + "/alert [Nachricht]");
+            Message.send("USAGE_ALERT", sender);
             return;
         }
 
-        StringBuilder msgBuilder = new StringBuilder();
+        Message.broadcast("ALERT", ChatColor.translateAlternateColorCodes('&', BungeeCore.CHAT_PREFIX + String.join(" ", args)));
-        msgBuilder.append(BungeeCore.CHAT_PREFIX);
-        for (String arg : args){
-            msgBuilder.append(arg).append(" ");
-        }
-        String msg = msgBuilder.toString();
-        msg = ChatColor.translateAlternateColorCodes('&', msg);
-        BungeeCore.broadcast(msg);
     }
 }

src/de/steamwar/bungeecore/commands/BanCommand.java

@@ -19,7 +19,7 @@
 
 package de.steamwar.bungeecore.commands;
 
-import de.steamwar.bungeecore.BungeeCore;
+import de.steamwar.bungeecore.Message;
 import de.steamwar.bungeecore.sql.SteamwarUser;
 import net.md_5.bungee.api.CommandSender;
 
@@ -38,7 +38,7 @@ public class BanCommand extends BasicCommand {
     @Override
     public void execute(CommandSender sender, String[] args) {
         if(args.length < 3){
-            BungeeCore.send(sender, BungeeCore.CHAT_PREFIX + "/ban [Spieler] [dd.mm.yyyy oder dd.mm.yyyy_hh:mm oder perma] [Grund]");
+            Message.send("USAGE_BAN", sender);
             return;
         }
 
@@ -55,7 +55,7 @@ public class BanCommand extends BasicCommand {
             banReason.append(args[i]).append(" ");
         }
         String msg = banReason.toString();
-        BungeeCore.send(sender, BungeeCore.CHAT_PREFIX + "Du hast " + target.getUserName() + " gebannt. Grund: §c" + msg);
+        Message.send("BAN_MESSAGE_YOU", sender, target.getUserName(), msg);
         target.ban(banTime, msg);
     }
 
@@ -73,7 +73,7 @@ public class BanCommand extends BasicCommand {
                     Date parsedDate = dateFormat.parse(arg.split("_")[0]);
                     return new java.sql.Timestamp(parsedDate.getTime());
                 }catch(ParseException exception){
-                    BungeeCore.send(sender, BungeeCore.CHAT_PREFIX + "§cUngültige Zeitangabe.");
+                    Message.send("INVALID_TIME", sender);
                     return null;
                 }
             }

src/de/steamwar/bungeecore/commands/BasicCommand.java

@@ -20,6 +20,7 @@
 package de.steamwar.bungeecore.commands;
 
 import de.steamwar.bungeecore.BungeeCore;
+import de.steamwar.bungeecore.Message;
 import de.steamwar.bungeecore.sql.SteamwarUser;
 import net.md_5.bungee.api.CommandSender;
 import net.md_5.bungee.api.ProxyServer;
@@ -55,7 +56,7 @@ abstract class BasicCommand extends Command implements TabExecutor {
     protected SteamwarUser user(CommandSender sender, String arg){
         SteamwarUser target = SteamwarUser.get(arg);
         if(target == null)
-            BungeeCore.send(sender, BungeeCore.CHAT_PREFIX + "§cDer Spieler existiert nicht.");
+            Message.send("UNKNOWN_PLAYER", sender);
         return target;
     }
 }

src/de/steamwar/bungeecore/commands/BugCommand.java

@@ -19,7 +19,7 @@
 
 package de.steamwar.bungeecore.commands;
 
-import de.steamwar.bungeecore.BungeeCore;
+import de.steamwar.bungeecore.Message;
 import de.steamwar.bungeecore.sql.SWException;
 import de.steamwar.bungeecore.sql.SteamwarUser;
 import net.md_5.bungee.api.CommandSender;
@@ -40,6 +40,6 @@ public class BugCommand extends BasicCommand {
         String message = String.join(" ", args);
         SteamwarUser user = SteamwarUser.get(player.getUniqueId());
         SWException.log(server, message, player.getName() + " " + user.getId());
-        BungeeCore.send(player, BungeeCore.CHAT_PREFIX + "§7Dein Bugreport wurde gemeldet.");
+        Message.send("BUG_MESSAGE", player);
     }
 }

src/de/steamwar/bungeecore/commands/DenyCommand.java

@@ -19,9 +19,8 @@
 
 package de.steamwar.bungeecore.commands;
 
-import de.steamwar.bungeecore.BungeeCore;
+import de.steamwar.bungeecore.Message;
 import net.md_5.bungee.api.CommandSender;
-import net.md_5.bungee.api.chat.TextComponent;
 import net.md_5.bungee.api.connection.ProxiedPlayer;
 
 public class DenyCommand extends BasicCommand {
@@ -34,7 +33,7 @@ public class DenyCommand extends BasicCommand {
     public void execute(CommandSender sender, String[] args) {
         if(sender instanceof ProxiedPlayer){
             ProxiedPlayer player = (ProxiedPlayer) sender;
-            player.sendMessage(new TextComponent(BungeeCore.CHAT_PREFIX + "§cUnbekannter Befehl."));
+            Message.send("UNKNOWN_COMMAND", player);
         }
     }
 }

src/de/steamwar/bungeecore/commands/IgnoreCommand.java

@@ -19,7 +19,7 @@
 
 package de.steamwar.bungeecore.commands;
 
-import de.steamwar.bungeecore.BungeeCore;
+import de.steamwar.bungeecore.Message;
 import de.steamwar.bungeecore.sql.IgnoreSystem;
 import de.steamwar.bungeecore.sql.SteamwarUser;
 import net.md_5.bungee.api.CommandSender;
@@ -34,7 +34,7 @@ public class IgnoreCommand extends BasicCommand {
     @Override
     public void execute(CommandSender sender, String[] args) {
         if(args.length < 1) {
-            BungeeCore.send(sender, BungeeCore.CHAT_PREFIX + "§8/§eignore §8[§7Spieler§8]");
+            Message.send("USAGE_IGNORE", sender);
             return;
         }
 
@@ -45,17 +45,19 @@ public class IgnoreCommand extends BasicCommand {
 
         SteamwarUser target = SteamwarUser.get(args[0]);
         if(target == null){
-            BungeeCore.send(p, BungeeCore.CHAT_PREFIX + "§cDiesen Spieler gibt es nicht.");
+            Message.send("UNKNOWN_PLAYER", p);
             return;
-        }else if(target.equals(user)){
+        }
-            BungeeCore.send(p, BungeeCore.CHAT_PREFIX + "§cWie willst du dich selber ignorieren?");
+        if(target.equals(user)){
+            Message.send("IGNORE_YOURSELF", p);
             return;
-        }else if(IgnoreSystem.isIgnored(user, target)){
+        }
-            BungeeCore.send(p, BungeeCore.CHAT_PREFIX + "§cDu ignorierst diesen Spieler bereits.");
+        if(IgnoreSystem.isIgnored(user, target)){
+            Message.send("IGNORE_ALREADY", p);
             return;
         }
 
         IgnoreSystem.ignore(user, target);
-        BungeeCore.send(p, BungeeCore.CHAT_PREFIX + "§7Du ignorierst nun §e" + target.getUserName() + "§8.");
+        Message.send("IGNORE_MESSAGE", p, target.getUserName());
     }
 }

src/de/steamwar/bungeecore/commands/MuteCommand.java

@@ -19,7 +19,7 @@
 
 package de.steamwar.bungeecore.commands;
 
-import de.steamwar.bungeecore.BungeeCore;
+import de.steamwar.bungeecore.Message;
 import de.steamwar.bungeecore.sql.SteamwarUser;
 import net.md_5.bungee.api.CommandSender;
 
@@ -34,7 +34,7 @@ public class MuteCommand extends BasicCommand {
     @Override
     public void execute(CommandSender sender, String[] args) {
         if(args.length < 3){
-            BungeeCore.send(sender, BungeeCore.CHAT_PREFIX + "/mute [Spieler] [dd.mm.yyyy oder dd.mm.yyyy_hh:mm oder perma] [Grund]");
+            Message.send("USAGE_MUTE", sender);
             return;
         }
 
@@ -51,7 +51,7 @@ public class MuteCommand extends BasicCommand {
             muteReason.append(args[i]).append(" ");
         }
         String msg = muteReason.toString();
-        BungeeCore.send(sender, BungeeCore.CHAT_PREFIX + "Du hast " + target.getUserName() + " gemuted. Grund: §c" + msg);
+        Message.send("MUTE_MESSAGE_YOU", sender, target.getUserName(), msg);
         target.mute(muteTime, msg);
     }
 }

src/de/steamwar/messages/BungeeCore.properties

@@ -1,5 +1,10 @@
 PREFIX=§eSteam§8War»
 
+UNKNOWN_COMMAND=§cUnbekannter Befehl.
+UNKNOWN_PLAYER=§cDiesen Spieler gibt es nicht.
+INVALID_TIME=§cUngültige Zeitangabe.
+
+#Help command
 HELP_LOBBY=§7Kehre von überall mit §8/§el §7zur Lobby zurück!
 HELP_LOBBY_HOVER=§eZurück zur Lobby
 HELP_BAU=§7Komme mit §8/§ebau §7auf den Bauserver!
@@ -54,6 +59,25 @@ HELP_BAU_TESTARENA_HOVER=§eTestarena starten
 HELP_BAU_BAU=§8/§ehelp bau §8- §7Hilfe zu nützlichen Werkzeugen
 HELP_BAU_BAU_HOVER=§eNützliche Zusatzfunktionen
 
+#Usage description of various commands
+USAGE_ALERT=§8/§7alert §8[§eNachricht§8]
+USAGE_BAN=§8/§7ban §8[§eSpieler§8] [§edd§8.§emm§8.§eyyyy §7oder §edd§8.§emm§8.§eyyyy§8_§ehh§8:§emm §7oder §eperma§8] [§eGrund§8]
+USAGE_MUTE=§8/§7mute §8[§eSpieler§8] [§edd§8.§emm§8.§eyyyy §7oder §edd§8.§emm§8.§eyyyy§8_§ehh§8:§emm §7oder §eperma§8] [§eGrund§8]
+USAGE_IGNORE=§8/§7ignore §8[§eSpieler§8]
+
+#Various commands
+ALERT=§f{0}
+
+BAN_MESSAGE_YOU=§7Du hast §e{0} §7gebannt§8. §7Grund§8: §c{1}
+
+MUTE_MESSAGE_YOU=§7Du hast §e{0} §7gemutet§8. §7Grund§8: §c{1}
+
+BUG_MESSAGE=§7Dein Bugreport wurde gespeichert.
+
+IGNORE_YOURSELF=§cWie willst du dich selber ignorieren?
+IGNORE_ALREADY=§cDu ignorierst diesen Spieler bereits.
+IGNORE_MESSAGE=§7Du ignorierst nun §e{0}§8.
+
 #PollresultCommand
 POLLRESULT_NOPOLL=§cDerzeit läuft keine Umfrage.
 POLLRESULT_HEADER=§eEs haben {0} abgestimmt auf die Frage: §7{1}