From 47120022c22143b20ca25f1004b3dcc445781b1f Mon Sep 17 00:00:00 2001 From: "Dylan K. Taylor" Date: Thu, 26 Aug 2021 13:29:31 +0100 Subject: [PATCH] Localize messages for /op and /deop --- resources/locale | 2 +- src/command/defaults/DeopCommand.php | 2 +- src/command/defaults/OpCommand.php | 2 +- src/lang/KnownTranslationFactory.php | 8 ++++++++ src/lang/KnownTranslationKeys.php | 2 ++ 5 files changed, 13 insertions(+), 3 deletions(-) diff --git a/resources/locale b/resources/locale index f07494a024..1332ae273a 160000 --- a/resources/locale +++ b/resources/locale @@ -1 +1 @@ -Subproject commit f07494a0245dc52fa6cbcc4d0e45703d1fc22ee8 +Subproject commit 1332ae273aefc6faf1c62fb62244050e75c4f5e1 diff --git a/src/command/defaults/DeopCommand.php b/src/command/defaults/DeopCommand.php index 615eb9b498..7d94c56330 100644 --- a/src/command/defaults/DeopCommand.php +++ b/src/command/defaults/DeopCommand.php @@ -61,7 +61,7 @@ class DeopCommand extends VanillaCommand{ $sender->getServer()->removeOp($name); if(($player = $sender->getServer()->getPlayerExact($name)) !== null){ - $player->sendMessage(TextFormat::GRAY . "You are no longer op!"); + $player->sendMessage(KnownTranslationFactory::commands_deop_message()->prefix(TextFormat::GRAY)); } Command::broadcastCommandMessage($sender, KnownTranslationFactory::commands_deop_success($name)); diff --git a/src/command/defaults/OpCommand.php b/src/command/defaults/OpCommand.php index 3e172b3daf..88348c7acd 100644 --- a/src/command/defaults/OpCommand.php +++ b/src/command/defaults/OpCommand.php @@ -61,7 +61,7 @@ class OpCommand extends VanillaCommand{ $sender->getServer()->addOp($name); if(($player = $sender->getServer()->getPlayerExact($name)) !== null){ - $player->sendMessage(TextFormat::GRAY . "You are now op!"); + $player->sendMessage(KnownTranslationFactory::commands_op_message()->prefix(TextFormat::GRAY)); } Command::broadcastCommandMessage($sender, KnownTranslationFactory::commands_op_success($name)); return true; diff --git a/src/lang/KnownTranslationFactory.php b/src/lang/KnownTranslationFactory.php index 650d19d83f..29615de91d 100644 --- a/src/lang/KnownTranslationFactory.php +++ b/src/lang/KnownTranslationFactory.php @@ -153,6 +153,10 @@ final class KnownTranslationFactory{ return new Translatable(KnownTranslationKeys::COMMANDS_DEFAULTGAMEMODE_USAGE, []); } + public static function commands_deop_message() : Translatable{ + return new Translatable(KnownTranslationKeys::COMMANDS_DEOP_MESSAGE, []); + } + public static function commands_deop_success(Translatable|string $param0) : Translatable{ return new Translatable(KnownTranslationKeys::COMMANDS_DEOP_SUCCESS, [ 0 => $param0, @@ -367,6 +371,10 @@ final class KnownTranslationFactory{ return new Translatable(KnownTranslationKeys::COMMANDS_MESSAGE_USAGE, []); } + public static function commands_op_message() : Translatable{ + return new Translatable(KnownTranslationKeys::COMMANDS_OP_MESSAGE, []); + } + public static function commands_op_success(Translatable|string $param0) : Translatable{ return new Translatable(KnownTranslationKeys::COMMANDS_OP_SUCCESS, [ 0 => $param0, diff --git a/src/lang/KnownTranslationKeys.php b/src/lang/KnownTranslationKeys.php index 12aaa7d57e..a5eea3c502 100644 --- a/src/lang/KnownTranslationKeys.php +++ b/src/lang/KnownTranslationKeys.php @@ -50,6 +50,7 @@ final class KnownTranslationKeys{ public const COMMANDS_CLEAR_TESTING = "commands.clear.testing"; public const COMMANDS_DEFAULTGAMEMODE_SUCCESS = "commands.defaultgamemode.success"; public const COMMANDS_DEFAULTGAMEMODE_USAGE = "commands.defaultgamemode.usage"; + public const COMMANDS_DEOP_MESSAGE = "commands.deop.message"; public const COMMANDS_DEOP_SUCCESS = "commands.deop.success"; public const COMMANDS_DEOP_USAGE = "commands.deop.usage"; public const COMMANDS_DIFFICULTY_SUCCESS = "commands.difficulty.success"; @@ -88,6 +89,7 @@ final class KnownTranslationKeys{ public const COMMANDS_MESSAGE_DISPLAY_OUTGOING = "commands.message.display.outgoing"; public const COMMANDS_MESSAGE_SAMETARGET = "commands.message.sameTarget"; public const COMMANDS_MESSAGE_USAGE = "commands.message.usage"; + public const COMMANDS_OP_MESSAGE = "commands.op.message"; public const COMMANDS_OP_SUCCESS = "commands.op.success"; public const COMMANDS_OP_USAGE = "commands.op.usage"; public const COMMANDS_PARTICLE_NOTFOUND = "commands.particle.notFound";