Fix consoleName translation key not working (#6506)

JRoy · web-flow · commit 87bde72678b9 · 2026-04-12T21:15:37.000Z
Fixes #6343
diff --git a/Essentials/src/main/java/com/earth2me/essentials/Console.java b/Essentials/src/main/java/com/earth2me/essentials/Console.java
@@ -13,7 +13,11 @@
 
 public final class Console implements IMessageRecipient {
     public static final String NAME = "Console";
-    public static final String DISPLAY_NAME = tlLiteral("consoleName");
+
+    public static String displayName() {
+        return tlLiteral("consoleName");
+    }
+
     private static Console instance; // Set in essentials
 
     private final IEssentials ess;
@@ -56,7 +60,7 @@ public UUID getUUID() {
 
     @Override
     public String getDisplayName() {
-        return Console.DISPLAY_NAME;
+        return displayName();
     }
 
     @Override
diff --git a/Essentials/src/main/java/com/earth2me/essentials/User.java b/Essentials/src/main/java/com/earth2me/essentials/User.java
@@ -887,7 +887,7 @@ public void checkActivity() {
 
                 for (final User user : ess.getOnlineUsers()) {
                     if (user.isAuthorized("essentials.kick.notify")) {
-                        user.sendTl("playerKicked", Console.DISPLAY_NAME, getName(), user.playerTl("autoAfkKickReason", kickTime));
+                        user.sendTl("playerKicked", Console.displayName(), getName(), user.playerTl("autoAfkKickReason", kickTime));
                     }
                 }
             } else {
diff --git a/Essentials/src/main/java/com/earth2me/essentials/commands/Commandban.java b/Essentials/src/main/java/com/earth2me/essentials/commands/Commandban.java
@@ -42,7 +42,7 @@ public void run(final Server server, final CommandSource sender, final String co
         }
 
         final String senderName = sender.isPlayer() ? sender.getPlayer().getDisplayName() : Console.NAME;
-        final String senderDisplayName = sender.isPlayer() ? sender.getPlayer().getDisplayName() : Console.DISPLAY_NAME;
+        final String senderDisplayName = sender.isPlayer() ? sender.getPlayer().getDisplayName() : Console.displayName();
         final String banReason;
         if (args.length > 1) {
             banReason = FormatUtil.replaceFormat(getFinalArg(args, 1).replace("\\n", "\n").replace("|", "\n"));
diff --git a/Essentials/src/main/java/com/earth2me/essentials/commands/Commandbanip.java b/Essentials/src/main/java/com/earth2me/essentials/commands/Commandbanip.java
@@ -26,7 +26,7 @@ public void run(final Server server, final CommandSource sender, final String co
         }
 
         final String senderName = sender.isPlayer() ? sender.getPlayer().getDisplayName() : Console.NAME;
-        final String senderDisplayName = sender.isPlayer() ? sender.getPlayer().getDisplayName() : Console.DISPLAY_NAME;
+        final String senderDisplayName = sender.isPlayer() ? sender.getPlayer().getDisplayName() : Console.displayName();
 
         String ipAddress;
         if (FormatUtil.validIP(args[0])) {
diff --git a/Essentials/src/main/java/com/earth2me/essentials/commands/Commandkick.java b/Essentials/src/main/java/com/earth2me/essentials/commands/Commandkick.java
@@ -50,7 +50,7 @@ public void run(final Server server, final CommandSource sender, final String co
 
         kickReason = event.getReason();
         target.getBase().kickPlayer(kickReason);
-        final String senderDisplayName = sender.isPlayer() ? sender.getPlayer().getDisplayName() : Console.DISPLAY_NAME;
+        final String senderDisplayName = sender.isPlayer() ? sender.getPlayer().getDisplayName() : Console.displayName();
 
         final String tlKey = "playerKicked";
         final Object[] objects = {senderDisplayName, target.getName(), kickReason};
diff --git a/Essentials/src/main/java/com/earth2me/essentials/commands/Commandmsg.java b/Essentials/src/main/java/com/earth2me/essentials/commands/Commandmsg.java
@@ -40,7 +40,7 @@ public void run(final Server server, final CommandSource sender, final String co
         }
 
         // Sending messages to console
-        if (args[0].equalsIgnoreCase(Console.NAME) || args[0].equalsIgnoreCase(Console.DISPLAY_NAME)) {
+        if (args[0].equalsIgnoreCase(Console.NAME) || args[0].equalsIgnoreCase(Console.displayName())) {
             final IMessageRecipient messageSender = sender.isPlayer() ? ess.getUser(sender.getPlayer()) : Console.getInstance();
             messageSender.sendMessage(Console.getInstance(), message);
             return;
diff --git a/Essentials/src/main/java/com/earth2me/essentials/commands/Commandtempban.java b/Essentials/src/main/java/com/earth2me/essentials/commands/Commandtempban.java
@@ -49,7 +49,7 @@ public void run(final Server server, final CommandSource sender, final String co
         }
 
         final String senderName = sender.isPlayer() ? sender.getPlayer().getDisplayName() : Console.NAME;
-        final String senderDisplayName = sender.isPlayer() ? sender.getPlayer().getDisplayName() : Console.DISPLAY_NAME;
+        final String senderDisplayName = sender.isPlayer() ? sender.getPlayer().getDisplayName() : Console.displayName();
         ess.getServer().getBanList(BanList.Type.NAME).addBan(user.getName(), banReason, new Date(banTimestamp), senderName);
         final String expiry = DateUtil.formatDateDiff(banTimestamp);
 
diff --git a/Essentials/src/main/java/com/earth2me/essentials/commands/Commandtempbanip.java b/Essentials/src/main/java/com/earth2me/essentials/commands/Commandtempbanip.java
@@ -28,7 +28,7 @@ public void run(final Server server, final CommandSource sender, final String co
         }
 
         final String senderName = sender.isPlayer() ? sender.getPlayer().getDisplayName() : Console.NAME;
-        final String senderDisplayName = sender.isPlayer() ? sender.getPlayer().getDisplayName() : Console.DISPLAY_NAME;
+        final String senderDisplayName = sender.isPlayer() ? sender.getPlayer().getDisplayName() : Console.displayName();
 
         String ipAddress;
         if (FormatUtil.validIP(args[0])) {
diff --git a/Essentials/src/main/java/com/earth2me/essentials/commands/Commandtp.java b/Essentials/src/main/java/com/earth2me/essentials/commands/Commandtp.java
@@ -120,7 +120,7 @@ public void run(final Server server, final CommandSource sender, final String co
         final User target = getPlayer(server, args, 0, true, false);
         if (args.length == 2) {
             final User toPlayer = getPlayer(server, args, 1, true, false);
-            target.sendTl("teleportAtoB", Console.DISPLAY_NAME, toPlayer.getDisplayName());
+            target.sendTl("teleportAtoB", Console.displayName(), toPlayer.getDisplayName());
             target.getAsyncTeleport().now(toPlayer.getBase(), false, TeleportCause.COMMAND, getNewExceptionFuture(sender, commandLabel));
         } else if (args.length > 3) {
             final double x = args[1].startsWith("~") ? target.getLocation().getX() + (args[1].length() > 1 ? Double.parseDouble(args[1].substring(1)) : 0) : Double.parseDouble(args[1]);
diff --git a/Essentials/src/main/java/com/earth2me/essentials/commands/Commandunban.java b/Essentials/src/main/java/com/earth2me/essentials/commands/Commandunban.java
@@ -38,7 +38,7 @@ public void run(final Server server, final CommandSource sender, final String co
             ess.getServer().getBanList(BanList.Type.NAME).pardon(name);
         }
 
-        final String senderDisplayName = sender.isPlayer() ? sender.getPlayer().getDisplayName() : Console.DISPLAY_NAME;
+        final String senderDisplayName = sender.isPlayer() ? sender.getPlayer().getDisplayName() : Console.displayName();
         ess.getLogger().log(Level.INFO, ess.getAdventureFacet().miniToLegacy(tlLiteral("playerUnbanned", senderDisplayName, name)));
 
         ess.broadcastTl((IUser) null, "essentials.ban.notify", "playerUnbanned", senderDisplayName, name);
diff --git a/Essentials/src/main/java/com/earth2me/essentials/commands/Commandunbanip.java b/Essentials/src/main/java/com/earth2me/essentials/commands/Commandunbanip.java
@@ -40,7 +40,7 @@ public void run(final Server server, final CommandSource sender, final String co
         }
 
         ess.getServer().getBanList(BanList.Type.IP).pardon(ipAddress);
-        final String senderDisplayName = sender.isPlayer() ? sender.getPlayer().getDisplayName() : Console.DISPLAY_NAME;
+        final String senderDisplayName = sender.isPlayer() ? sender.getPlayer().getDisplayName() : Console.displayName();
         ess.getLogger().log(Level.INFO, ess.getAdventureFacet().miniToLegacy(tlLiteral("playerUnbanIpAddress", senderDisplayName, ipAddress)));
 
         ess.broadcastTl((IUser) null, "essentials.banip.notify", "playerUnbanIpAddress", senderDisplayName, ipAddress);
diff --git a/EssentialsDiscord/src/main/java/net/essentialsx/discord/listeners/BukkitListener.java b/EssentialsDiscord/src/main/java/net/essentialsx/discord/listeners/BukkitListener.java
@@ -80,7 +80,7 @@ public void onMute(MuteStatusChangeEvent event) {
                             MessageUtil.sanitizeDiscordMarkdown(event.getAffected().getName()),
                             MessageUtil.sanitizeDiscordMarkdown(event.getAffected().getDisplayName()),
                             MessageUtil.sanitizeDiscordMarkdown(console ? Console.NAME : event.getController().getName()),
-                            MessageUtil.sanitizeDiscordMarkdown(console ? Console.DISPLAY_NAME : event.getController().getDisplayName()),
+                            MessageUtil.sanitizeDiscordMarkdown(console ? Console.displayName() : event.getController().getDisplayName()),
                             DateUtil.formatDateDiff(event.getTimestamp().get()),
                             MessageUtil.sanitizeDiscordMarkdown(event.getReason())));
         } else {
@@ -91,7 +91,7 @@ public void onMute(MuteStatusChangeEvent event) {
                             MessageUtil.sanitizeDiscordMarkdown(event.getAffected().getName()),
                             MessageUtil.sanitizeDiscordMarkdown(event.getAffected().getDisplayName()),
                             MessageUtil.sanitizeDiscordMarkdown(console ? Console.NAME : event.getController().getName()),
-                            MessageUtil.sanitizeDiscordMarkdown(console ? Console.DISPLAY_NAME : event.getController().getDisplayName()),
+                            MessageUtil.sanitizeDiscordMarkdown(console ? Console.displayName() : event.getController().getDisplayName()),
                             MessageUtil.sanitizeDiscordMarkdown(event.getReason())));
         }
     }
diff --git a/EssentialsSpawn/src/main/java/com/earth2me/essentials/spawn/Commandspawn.java b/EssentialsSpawn/src/main/java/com/earth2me/essentials/spawn/Commandspawn.java
@@ -53,7 +53,7 @@ protected void run(final Server server, final CommandSource sender, final String
         respawn(sender, null, user, null, commandLabel, future);
         future.thenAccept(success -> {
             if (success) {
-                user.sendTl("teleportAtoB", Console.DISPLAY_NAME, "spawn");
+                user.sendTl("teleportAtoB", Console.displayName(), "spawn");
             }
         });
     }
diff --git a/EssentialsXMPP/src/main/java/com/earth2me/essentials/xmpp/Commandxmpp.java b/EssentialsXMPP/src/main/java/com/earth2me/essentials/xmpp/Commandxmpp.java
@@ -25,7 +25,7 @@ protected void run(final Server server, final CommandSource sender, final String
         }
 
         final String message = getFinalArg(args, 1);
-        final String senderName = sender.isPlayer() ? ess.getUser(sender.getPlayer()).getDisplayName() : Console.DISPLAY_NAME;
+        final String senderName = sender.isPlayer() ? ess.getUser(sender.getPlayer()).getDisplayName() : Console.displayName();
         sender.sendMessage("[" + senderName + ">" + address + "] " + message);
         if (!EssentialsXMPP.getInstance().sendMessage(address, "[" + senderName + "] " + message)) {
             sender.sendMessage(ChatColor.RED + "Error sending message.");

Original file line number	Diff line number	Diff line change
`@@ -887,7 +887,7 @@ public void checkActivity() {`
`887`	`887`
`888`	`888`	`for (final User user : ess.getOnlineUsers()) {`
`889`	`889`	`if (user.isAuthorized("essentials.kick.notify")) {`
`890`		`- user.sendTl("playerKicked", Console.DISPLAY_NAME, getName(), user.playerTl("autoAfkKickReason", kickTime));`
	`890`	`+ user.sendTl("playerKicked", Console.displayName(), getName(), user.playerTl("autoAfkKickReason", kickTime));`
`891`	`891`	`}`
`892`	`892`	`}`
`893`	`893`	`} else {`
Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,7 @@ public void run(final Server server, final CommandSource sender, final String co`
`42`	`42`	`}`
`43`	`43`
`44`	`44`	`final String senderName = sender.isPlayer() ? sender.getPlayer().getDisplayName() : Console.NAME;`
`45`		`- final String senderDisplayName = sender.isPlayer() ? sender.getPlayer().getDisplayName() : Console.DISPLAY_NAME;`
	`45`	`+ final String senderDisplayName = sender.isPlayer() ? sender.getPlayer().getDisplayName() : Console.displayName();`
`46`	`46`	`final String banReason;`
`47`	`47`	`if (args.length > 1) {`
`48`	`48`	`banReason = FormatUtil.replaceFormat(getFinalArg(args, 1).replace("\\n", "\n").replace("\|", "\n"));`
Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ public void run(final Server server, final CommandSource sender, final String co`
`26`	`26`	`}`
`27`	`27`
`28`	`28`	`final String senderName = sender.isPlayer() ? sender.getPlayer().getDisplayName() : Console.NAME;`
`29`		`- final String senderDisplayName = sender.isPlayer() ? sender.getPlayer().getDisplayName() : Console.DISPLAY_NAME;`
	`29`	`+ final String senderDisplayName = sender.isPlayer() ? sender.getPlayer().getDisplayName() : Console.displayName();`
`30`	`30`
`31`	`31`	`String ipAddress;`
`32`	`32`	`if (FormatUtil.validIP(args[0])) {`
Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,7 @@ public void run(final Server server, final CommandSource sender, final String co`
`40`	`40`	`}`
`41`	`41`
`42`	`42`	`// Sending messages to console`
`43`		`- if (args[0].equalsIgnoreCase(Console.NAME) \|\| args[0].equalsIgnoreCase(Console.DISPLAY_NAME)) {`
	`43`	`+ if (args[0].equalsIgnoreCase(Console.NAME) \|\| args[0].equalsIgnoreCase(Console.displayName())) {`
`44`	`44`	`final IMessageRecipient messageSender = sender.isPlayer() ? ess.getUser(sender.getPlayer()) : Console.getInstance();`
`45`	`45`	`messageSender.sendMessage(Console.getInstance(), message);`
`46`	`46`	`return;`
Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,7 @@ public void run(final Server server, final CommandSource sender, final String co`
`49`	`49`	`}`
`50`	`50`
`51`	`51`	`final String senderName = sender.isPlayer() ? sender.getPlayer().getDisplayName() : Console.NAME;`
`52`		`- final String senderDisplayName = sender.isPlayer() ? sender.getPlayer().getDisplayName() : Console.DISPLAY_NAME;`
	`52`	`+ final String senderDisplayName = sender.isPlayer() ? sender.getPlayer().getDisplayName() : Console.displayName();`
`53`	`53`	`ess.getServer().getBanList(BanList.Type.NAME).addBan(user.getName(), banReason, new Date(banTimestamp), senderName);`
`54`	`54`	`final String expiry = DateUtil.formatDateDiff(banTimestamp);`
`55`	`55`
Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ public void run(final Server server, final CommandSource sender, final String co`
`28`	`28`	`}`
`29`	`29`
`30`	`30`	`final String senderName = sender.isPlayer() ? sender.getPlayer().getDisplayName() : Console.NAME;`
`31`		`- final String senderDisplayName = sender.isPlayer() ? sender.getPlayer().getDisplayName() : Console.DISPLAY_NAME;`
	`31`	`+ final String senderDisplayName = sender.isPlayer() ? sender.getPlayer().getDisplayName() : Console.displayName();`
`32`	`32`
`33`	`33`	`String ipAddress;`
`34`	`34`	`if (FormatUtil.validIP(args[0])) {`
Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,7 @@ public void run(final Server server, final CommandSource sender, final String co`
`38`	`38`	`ess.getServer().getBanList(BanList.Type.NAME).pardon(name);`
`39`	`39`	`}`
`40`	`40`
`41`		`- final String senderDisplayName = sender.isPlayer() ? sender.getPlayer().getDisplayName() : Console.DISPLAY_NAME;`
	`41`	`+ final String senderDisplayName = sender.isPlayer() ? sender.getPlayer().getDisplayName() : Console.displayName();`
`42`	`42`	`ess.getLogger().log(Level.INFO, ess.getAdventureFacet().miniToLegacy(tlLiteral("playerUnbanned", senderDisplayName, name)));`
`43`	`43`
`44`	`44`	`ess.broadcastTl((IUser) null, "essentials.ban.notify", "playerUnbanned", senderDisplayName, name);`