From 13fcf0cbc38a936b83b2667d1ad31d40b5ac6b59 Mon Sep 17 00:00:00 2001 From: JeremyStarTM Date: Wed, 9 Oct 2024 10:49:58 +0200 Subject: [PATCH] Update messaging-related translation keys --- .../pickshadow/api/translation/LanguageString.java | 14 ++++++-------- .../pickshadow/command/general/MessageCommand.java | 2 +- .../pickshadow/listener/ChatListener.java | 2 +- extension/src/main/resources/translations/de.json | 8 ++++++-- extension/src/main/resources/translations/en.json | 12 +++++++----- 5 files changed, 21 insertions(+), 17 deletions(-) diff --git a/extension/src/main/java/de/jeremystartm/pickshadow/api/translation/LanguageString.java b/extension/src/main/java/de/jeremystartm/pickshadow/api/translation/LanguageString.java index 972d056..a03e21f 100644 --- a/extension/src/main/java/de/jeremystartm/pickshadow/api/translation/LanguageString.java +++ b/extension/src/main/java/de/jeremystartm/pickshadow/api/translation/LanguageString.java @@ -50,7 +50,7 @@ public enum LanguageString { ERROR_INVALID_ARGUMENT, ERROR_PLAYER_NOT_FOUND, - // Connection errors + // Connection CONNECTION_ERROR_REGISTRATION, CONNECTION_ERROR_TABLISTHANDLER, @@ -61,16 +61,17 @@ public enum LanguageString { EXTENSIONCMD_SOURCE, EXTENSIONCMD_ERROR_OLDCMD, + // Command group 'messaging' + MESSAGING_SERVER, + MESSAGING_DIRECT, + MESSAGING_ERROR_SELF, + // Command group 'links' LINKS_WEBSITE, LINKS_DISCORD, LINKS_TEAMSPEAK, LINKS_MUMBLE, - // Command group 'messaging' - MESSAGING_FORMAT, - MESSAGING_ERROR_SELF, - // Command /clearchat CLEARCHAT_GENERIC, CLEARCHAT_VOID, @@ -95,9 +96,6 @@ public enum LanguageString { TROLL_HACK_COMPLETE, TROLL_HEAVENS, - // Event for chat messages - CHATMESSAGE_SERVER, - // Event for chat commands CHATCOMMAND_ERROR_NAMESPACE, } diff --git a/extension/src/main/java/de/jeremystartm/pickshadow/command/general/MessageCommand.java b/extension/src/main/java/de/jeremystartm/pickshadow/command/general/MessageCommand.java index 873a2d0..8034738 100644 --- a/extension/src/main/java/de/jeremystartm/pickshadow/command/general/MessageCommand.java +++ b/extension/src/main/java/de/jeremystartm/pickshadow/command/general/MessageCommand.java @@ -104,7 +104,7 @@ public final class MessageCommand extends CommandBase { } output = TranslationManager.get( - LanguageString.MESSAGING_FORMAT, + LanguageString.MESSAGING_DIRECT, sender, false, entry("from", player.getName()), diff --git a/extension/src/main/java/de/jeremystartm/pickshadow/listener/ChatListener.java b/extension/src/main/java/de/jeremystartm/pickshadow/listener/ChatListener.java index ebb3ba9..133f340 100644 --- a/extension/src/main/java/de/jeremystartm/pickshadow/listener/ChatListener.java +++ b/extension/src/main/java/de/jeremystartm/pickshadow/listener/ChatListener.java @@ -47,7 +47,7 @@ public final class ChatListener implements Listener { event.setCancelled(true); Bukkit.broadcast( MiniMessage.miniMessage().deserialize( - TranslationManager.get(LanguageString.CHATMESSAGE_SERVER, event.getPlayer(), false) + TranslationManager.get(LanguageString.MESSAGING_SERVER, event.getPlayer(), false) .replace("%sender%", event.getPlayer().getName()) ).append(MiniMessage.miniMessage().deserialize(MiniMessage.miniMessage().serialize(event.originalMessage()).replace("\\<", "<"))) ); diff --git a/extension/src/main/resources/translations/de.json b/extension/src/main/resources/translations/de.json index f10faca..7add1c0 100644 --- a/extension/src/main/resources/translations/de.json +++ b/extension/src/main/resources/translations/de.json @@ -8,19 +8,23 @@ "ERROR_INVALID_ARGUMENT": "Ungültige(s) Argument(e) %argument%.", "ERROR_PLAYER_NOT_FOUND": "Der Spieler %player% konnte nicht gefunden werden.", + "CONNECTION_JOIN": "%player% ist dem Spiel beigetreten", + "CONNECTION_JOIN_WELCOME": "Willkommen zu , %player%!", + "CONNECTION_DISCONNECT": "%player% hat das Spiel verlassen", + "EXTENSIONCMD_GREETER": "Dieser Subserver läuft <#d60532>PSSE \"%codename%\" @ %version% (%commit%, dirty %dirty%)\nFühre ein paar Subbefehle aus um mehr Informationen einzusehen.", "EXTENSIONCMD_KILLJVM": "Bye bye!", "EXTENSIONCMD_LICENSE": "PSSE ist lizensiert unter der GNU Affero General Public-Lizenz v3.", "EXTENSIONCMD_SOURCE": "Du kannst PickShadow's serverseitigen Code auf sos!git finden.", "EXTENSIONCMD_ERROR_OLDCMD": "Was ist PSSP...?\nDas PickShadow Server Plugin (PSSP) wurde in PickShadow Server Extension (PSSE) umbenannt.\nBitte verwende diesen Namen stattdessen, vielen Dank.", + "MESSAGING_ERROR_SELF": "Du kannst dich nicht selber anschreiben.", + "LINKS_WEBSITE": "Das PickShadow Netzwerk hat aktuell keine Webseite.", "LINKS_DISCORD": "Das PickShadow Netzwerk hat aktuell keine Discord Guilde.", "LINKS_TEAMSPEAK": "Das PickShadow Netzwerk hat aktuell keinen TeamSpeak Server.", "LINKS_MUMBLE": "Das PickShadow Netzwerk hat aktuell keinen Mumble Server.", - "MESSAGING_ERROR_SELF": "Du kannst dich nicht selber anschreiben.", - "CLEARCHAT_GENERIC": "Der Chat wurde von %sender% geleert.", "CLEARCHAT_VOID": "Der Chat wurde von %sender% ins Void geschubst.", "CLEARCHAT_SKILLISSUES": "Der Chat wurde von %sender% aufgrund von Skill Issues der Chatteilnehmer gelöscht.", diff --git a/extension/src/main/resources/translations/en.json b/extension/src/main/resources/translations/en.json index da4d959..038f575 100644 --- a/extension/src/main/resources/translations/en.json +++ b/extension/src/main/resources/translations/en.json @@ -20,6 +20,9 @@ "ERROR_INVALID_ARGUMENT": "Invalid argument(s) %argument%.", "ERROR_PLAYER_NOT_FOUND": "The player %player% could not be found.", + "CONNECTION_JOIN": "%player% joined the game", + "CONNECTION_JOIN_WELCOME": "Welcome to , %player%!", + "CONNECTION_DISCONNECT": "%player% left the game", "CONNECTION_ERROR_REGISTRATION": "Unable to process log in", "CONNECTION_ERROR_TABLISTHANDLER": "TabListHandler failed unexpectedly", @@ -29,14 +32,15 @@ "EXTENSIONCMD_SOURCE": "You can find the source code of PickShadow's server-side code on sos!git.", "EXTENSIONCMD_ERROR_OLDCMD": "What's PSSP...?\nThe PickShadow Server Plugin (PSSP) has been renamed into PickShadow Server Extension (PSSE).\nPlease use this name instead, thank you.", + "MESSAGING_SERVER": "%sender% <#d60532>» ", + "MESSAGING_DIRECT": "%from% » %to% » %message%", + "MESSAGING_ERROR_SELF": "You can't message yourself.", + "LINKS_WEBSITE": "The PickShadow Network doesn't currently have a website.", "LINKS_DISCORD": "The PickShadow Network doesn't currently have a Discord guild.", "LINKS_TEAMSPEAK": "The PickShadow Network doesn't currently have a TeamSpeak server.", "LINKS_MUMBLE": "The PickShadow Network doesn't currently have a Mumble server.", - "MESSAGING_FORMAT": "%from% » %to% » %message%", - "MESSAGING_ERROR_SELF": "You can't message yourself.", - "CLEARCHAT_GENERIC": "The chat has been cleared by %sender%.", "CLEARCHAT_VOID": "The chat has been pushed into the void by %sender%.", "CLEARCHAT_SKILLISSUES": "The chat has been cleared by %sender% due to skill issues of the chat participants.", @@ -57,7 +61,5 @@ "TROLL_HACK_COMPLETE": "Access granted.", "TROLL_HEAVENS": "%target% believes that they can fly.", - "CHATMESSAGE_SERVER": "%sender% <#d60532>» ", - "CHATCOMMAND_ERROR_NAMESPACE": "Using namespaces is not allowed, as it may be used to circumvent security measures." }