Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Allow console name to be translated #3700

Merged
merged 8 commits into from Dec 11, 2020
Merged

Allow console name to be translated #3700

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
eea0a32
Console name i18n
Haarolean Oct 3, 2020
d6bc1d0
Fix native ascii conversion
Haarolean Oct 3, 2020
99aa104
Merge remote-tracking branch 'upstream/2.x' into feature/2756
Haarolean Oct 5, 2020
a3a1710
Sort newly added property
Haarolean Oct 8, 2020
3e56729
Rollback line breaks
Haarolean Nov 24, 2020
8f33943
Review fix++
Haarolean Nov 24, 2020
7f6b06d
Merge remote-tracking branch 'upstream/2.x' into feature/2756
Haarolean Nov 27, 2020
61684e2
Merge remote-tracking branch 'upstream/2.x' into feature/2756
Haarolean Dec 7, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
5 changes: 4 additions & 1 deletion Essentials/src/com/earth2me/essentials/Console.java
View file
Open in desktop
Expand Up @@ -5,8 +5,11 @@
import org.bukkit.Server;
import org.bukkit.command.CommandSender;

import static com.earth2me.essentials.I18n.tl;

public final class Console implements IMessageRecipient {
public static final String NAME = "Console";
public static final String DISPLAY_NAME = tl("consoleName");
private static Console instance; // Set in essentials

private final IEssentials ess;
Expand Down Expand Up @@ -44,7 +47,7 @@ public String getName() {

@Override
public String getDisplayName() {
return Console.NAME;
return Console.DISPLAY_NAME;
}

@Override
Expand Down
7 changes: 2 additions & 5 deletions Essentials/src/com/earth2me/essentials/EssentialsUpgrade.java
View file
Open in desktop
Expand Up @@ -680,11 +680,8 @@ public void banFormatChange() {
}

private void updateBan(final String playerName, final String banReason, final Long banTimeout) {
if (banTimeout == 0) {
Bukkit.getBanList(BanList.Type.NAME).addBan(playerName, banReason, null, Console.NAME);
} else {
Bukkit.getBanList(BanList.Type.NAME).addBan(playerName, banReason, new Date(banTimeout), Console.NAME);
}
final Date date = banTimeout == 0 ? null : new Date(banTimeout);
Bukkit.getBanList(BanList.Type.NAME).addBan(playerName, banReason, date, Console.NAME);
Haarolean marked this conversation as resolved.
Show resolved Hide resolved
}

private void repairUserMap() {
Expand Down
2 changes: 1 addition & 1 deletion Essentials/src/com/earth2me/essentials/User.java
View file
Open in desktop
Expand Up @@ -679,7 +679,7 @@ public void checkActivity() {

for (final User user : ess.getOnlineUsers()) {
if (user.isAuthorized("essentials.kick.notify")) {
user.sendMessage(tl("playerKicked", Console.NAME, getName(), kickReason));
user.sendMessage(tl("playerKicked", Console.DISPLAY_NAME, getName(), kickReason));
}
}
}
Expand Down
8 changes: 5 additions & 3 deletions Essentials/src/com/earth2me/essentials/commands/Commandban.java
View file
Open in desktop
Expand Up @@ -41,6 +41,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 banReason;
if (args.length > 1) {
banReason = FormatUtil.replaceFormat(getFinalArg(args, 1).replace("\\n", "\n").replace("|", "\n"));
Expand All @@ -50,16 +51,17 @@ public void run(final Server server, final CommandSource sender, final String co

ess.getServer().getBanList(BanList.Type.NAME).addBan(user.getName(), banReason, null, senderName);

final String banDisplay = tl("banFormat", banReason, senderName);
final String banDisplay = tl("banFormat", banReason, senderDisplayName);

user.getBase().kickPlayer(banDisplay);
server.getLogger().log(Level.INFO, tl("playerBanned", senderName, user.getName(), banDisplay));
server.getLogger().log(Level.INFO, tl("playerBanned", senderDisplayName, user.getName(), banDisplay));

if (nomatch) {
sender.sendMessage(tl("userUnknown", user.getName()));
}

ess.broadcastMessage("essentials.ban.notify", tl("playerBanned", senderName, user.getName(), banReason));
ess.broadcastMessage("essentials.ban.notify", tl("playerBanned",
senderDisplayName, user.getName(), banReason));
Haarolean marked this conversation as resolved.
Show resolved Hide resolved
}

@Override
Expand Down
8 changes: 5 additions & 3 deletions Essentials/src/com/earth2me/essentials/commands/Commandbanip.java
View file
Open in desktop
Expand Up @@ -26,6 +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;

String ipAddress;
if (FormatUtil.validIP(args[0])) {
Expand All @@ -50,18 +51,19 @@ public void run(final Server server, final CommandSource sender, final String co
banReason = tl("defaultBanReason");
}

final String banDisplay = tl("banFormat", banReason, senderName);
final String banDisplay = tl("banFormat", banReason, senderDisplayName);

ess.getServer().getBanList(BanList.Type.IP).addBan(ipAddress, banReason, null, senderName);
server.getLogger().log(Level.INFO, tl("playerBanIpAddress", senderName, ipAddress, banReason));
server.getLogger().log(Level.INFO, tl("playerBanIpAddress", senderDisplayName, ipAddress, banReason));

for (final Player player : ess.getServer().getOnlinePlayers()) {
if (player.getAddress().getAddress().getHostAddress().equalsIgnoreCase(ipAddress)) {
player.kickPlayer(banDisplay);
}
}

ess.broadcastMessage("essentials.banip.notify", tl("playerBanIpAddress", senderName, ipAddress, banReason));
ess.broadcastMessage("essentials.banip.notify", tl("playerBanIpAddress",
senderDisplayName, ipAddress, banReason));
Haarolean marked this conversation as resolved.
Show resolved Hide resolved
}

@Override
Expand Down
2 changes: 1 addition & 1 deletion Essentials/src/com/earth2me/essentials/commands/Commandhelpop.java
View file
Open in desktop
Expand Up @@ -28,7 +28,7 @@ public void run(final Server server, final User user, final String commandLabel,

@Override
public void run(final Server server, final CommandSource sender, final String commandLabel, final String[] args) throws Exception {
sendMessage(server, Console.NAME, args);
sendMessage(server, Console.DISPLAY_NAME, args);
}

private String sendMessage(final Server server, final String from, final String[] args) throws Exception {
Expand Down
6 changes: 3 additions & 3 deletions Essentials/src/com/earth2me/essentials/commands/Commandkick.java
View file
Open in desktop
Expand Up @@ -39,10 +39,10 @@ public void run(final Server server, final CommandSource sender, final String co
kickReason = FormatUtil.replaceFormat(kickReason.replace("\\n", "\n").replace("|", "\n"));

target.getBase().kickPlayer(kickReason);
final String senderName = sender.isPlayer() ? sender.getPlayer().getDisplayName() : Console.NAME;
final String senderDisplayName = sender.isPlayer() ? sender.getPlayer().getDisplayName() : Console.DISPLAY_NAME;

server.getLogger().log(Level.INFO, tl("playerKicked", senderName, target.getName(), kickReason));
ess.broadcastMessage("essentials.kick.notify", tl("playerKicked", senderName, target.getName(), kickReason));
server.getLogger().log(Level.INFO, tl("playerKicked", senderDisplayName, target.getName(), kickReason));
ess.broadcastMessage("essentials.kick.notify", tl("playerKicked", senderDisplayName, target.getName(), kickReason));
}

@Override
Expand Down
5 changes: 3 additions & 2 deletions Essentials/src/com/earth2me/essentials/commands/Commandmsg.java
View file
Open in desktop
Expand Up @@ -40,8 +40,9 @@ public void run(final Server server, final CommandSource sender, final String co
}

// Sending messages to console
if (args[0].equalsIgnoreCase(Console.NAME)) {
final IMessageRecipient messageSender = sender.isPlayer() ? ess.getUser(sender.getPlayer()) : Console.getInstance();
if (args[0].equalsIgnoreCase(Console.NAME) || args[0].equalsIgnoreCase(Console.DISPLAY_NAME)) {
final IMessageRecipient messageSender = sender.isPlayer() ? ess.getUser(sender.getPlayer()) :
Console.getInstance();
Haarolean marked this conversation as resolved.
Show resolved Hide resolved
messageSender.sendMessage(Console.getInstance(), message);
return;
}
Expand Down
5 changes: 3 additions & 2 deletions Essentials/src/com/earth2me/essentials/commands/Commandtempban.java
View file
Open in desktop
Expand Up @@ -47,12 +47,13 @@ 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;
ess.getServer().getBanList(BanList.Type.NAME).addBan(user.getName(), banReason, new Date(banTimestamp), senderName);
final String expiry = DateUtil.formatDateDiff(banTimestamp);

user.getBase().kickPlayer(tl("tempBanned", expiry, senderName, banReason));
user.getBase().kickPlayer(tl("tempBanned", expiry, senderDisplayName, banReason));

final String message = tl("playerTempBanned", senderName, user.getName(), expiry, banReason);
final String message = tl("playerTempBanned", senderDisplayName, user.getName(), expiry, banReason);
server.getLogger().log(Level.INFO, message);
ess.broadcastMessage("essentials.ban.notify", message);
}
Expand Down
6 changes: 4 additions & 2 deletions Essentials/src/com/earth2me/essentials/commands/Commandtempbanip.java
View file
Open in desktop
Expand Up @@ -28,6 +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;

String ipAddress;
if (FormatUtil.validIP(args[0])) {
Expand Down Expand Up @@ -61,14 +62,15 @@ public void run(final Server server, final CommandSource sender, final String co

ess.getServer().getBanList(BanList.Type.IP).addBan(ipAddress, banReason, new Date(banTimestamp), senderName);

final String banDisplay = tl("banFormat", banReason, senderName);
final String banDisplay = tl("banFormat", banReason, senderDisplayName);
for (final Player player : ess.getServer().getOnlinePlayers()) {
if (player.getAddress().getAddress().getHostAddress().equalsIgnoreCase(ipAddress)) {
player.kickPlayer(banDisplay);
}
}

final String message = tl("playerTempBanIpAddress", senderName, ipAddress, DateUtil.formatDateDiff(banTimestamp), banReason);
final String message = tl("playerTempBanIpAddress", senderDisplayName, ipAddress,
DateUtil.formatDateDiff(banTimestamp), banReason);
server.getLogger().log(Level.INFO, message);
ess.broadcastMessage("essentials.banip.notify", message);
}
Expand Down
2 changes: 1 addition & 1 deletion Essentials/src/com/earth2me/essentials/commands/Commandtp.java
View file
Open in desktop
Expand Up @@ -119,7 +119,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.sendMessage(tl("teleportAtoB", Console.NAME, toPlayer.getDisplayName()));
target.sendMessage(tl("teleportAtoB", Console.DISPLAY_NAME, 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]);
Expand Down
6 changes: 3 additions & 3 deletions Essentials/src/com/earth2me/essentials/commands/Commandunban.java
View file
Open in desktop
Expand Up @@ -36,9 +36,9 @@ public void run(final Server server, final CommandSource sender, final String co
ess.getServer().getBanList(BanList.Type.NAME).pardon(name);
}

final String senderName = sender.isPlayer() ? sender.getPlayer().getDisplayName() : Console.NAME;
server.getLogger().log(Level.INFO, tl("playerUnbanned", senderName, name));
final String senderDisplayName = sender.isPlayer() ? sender.getPlayer().getDisplayName() : Console.DISPLAY_NAME;
server.getLogger().log(Level.INFO, tl("playerUnbanned", senderDisplayName, name));

ess.broadcastMessage("essentials.ban.notify", tl("playerUnbanned", senderName, name));
ess.broadcastMessage("essentials.ban.notify", tl("playerUnbanned", senderDisplayName, name));
}
}
6 changes: 3 additions & 3 deletions Essentials/src/com/earth2me/essentials/commands/Commandunbanip.java
View file
Open in desktop
Expand Up @@ -39,9 +39,9 @@ public void run(final Server server, final CommandSource sender, final String co
}

ess.getServer().getBanList(BanList.Type.IP).pardon(ipAddress);
final String senderName = sender.isPlayer() ? sender.getPlayer().getDisplayName() : Console.NAME;
server.getLogger().log(Level.INFO, tl("playerUnbanIpAddress", senderName, ipAddress));
final String senderDisplayName = sender.isPlayer() ? sender.getPlayer().getDisplayName() : Console.DISPLAY_NAME;
server.getLogger().log(Level.INFO, tl("playerUnbanIpAddress", senderDisplayName, ipAddress));

ess.broadcastMessage("essentials.banip.notify", tl("playerUnbanIpAddress", senderName, ipAddress));
ess.broadcastMessage("essentials.banip.notify", tl("playerUnbanIpAddress", senderDisplayName, ipAddress));
}
}
1 change: 1 addition & 0 deletions Essentials/src/messages.properties
View file
Open in desktop
Expand Up @@ -973,3 +973,4 @@ years=years
youAreHealed=\u00a76You have been healed.
youHaveNewMail=\u00a76You have\u00a7c {0} \u00a76messages\! Type \u00a7c/mail read\u00a76 to view your mail.
xmppNotConfigured=XMPP is not configured properly. If you do not know what XMPP is, you may wish to remove the EssentialsXXMPP plugin from your server.
consoleName=Console
Haarolean marked this conversation as resolved.
Show resolved Hide resolved
2 changes: 1 addition & 1 deletion EssentialsSpawn/src/com/earth2me/essentials/spawn/Commandspawn.java
View file
Open in desktop
Expand Up @@ -54,7 +54,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.sendMessage(tl("teleportAtoB", Console.NAME, "spawn"));
user.sendMessage(tl("teleportAtoB", Console.DISPLAY_NAME, "spawn"));
}
});
}
Expand Down
4 changes: 3 additions & 1 deletion EssentialsXMPP/src/com/earth2me/essentials/xmpp/Commandxmpp.java
View file
Open in desktop
Expand Up @@ -25,7 +25,9 @@ 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.NAME;
final String senderName = sender.isPlayer()
? ess.getUser(sender.getPlayer()).getDisplayName()
: Console.DISPLAY_NAME;
Haarolean marked this conversation as resolved.
Show resolved Hide resolved
sender.sendMessage("[" + senderName + ">" + address + "] " + message);
if (!EssentialsXMPP.getInstance().sendMessage(address, "[" + senderName + "] " + message)) {
sender.sendMessage(ChatColor.RED + "Error sending message.");
Expand Down