From ccc881ee5808a747bb197dfee19a2d2cd3a47341 Mon Sep 17 00:00:00 2001 From: "Dylan K. Taylor" Date: Sat, 9 Oct 2021 00:57:15 +0100 Subject: [PATCH] Switch to custom permission denied message closes #4494 --- resources/locale | 2 +- src/command/Command.php | 2 +- src/lang/KnownTranslationFactory.php | 6 ++++++ src/lang/KnownTranslationKeys.php | 1 + 4 files changed, 9 insertions(+), 2 deletions(-) diff --git a/resources/locale b/resources/locale index c940b9f17..299927cf8 160000 --- a/resources/locale +++ b/resources/locale @@ -1 +1 @@ -Subproject commit c940b9f17188548f78d0dc5fdd4e607c703b7952 +Subproject commit 299927cf85ef6b19d9a159e0bde66ef50e1c143d diff --git a/src/command/Command.php b/src/command/Command.php index ff08620f1..ea324a933 100644 --- a/src/command/Command.php +++ b/src/command/Command.php @@ -117,7 +117,7 @@ abstract class Command{ } if($this->permissionMessage === null){ - $target->sendMessage(KnownTranslationFactory::commands_generic_permission()->prefix(TextFormat::RED)); + $target->sendMessage(KnownTranslationFactory::pocketmine_command_error_permission($this->name)->prefix(TextFormat::RED)); }elseif($this->permissionMessage !== ""){ $target->sendMessage(str_replace("", $permission ?? $this->permission, $this->permissionMessage)); } diff --git a/src/lang/KnownTranslationFactory.php b/src/lang/KnownTranslationFactory.php index 43d3ce3b1..78f0abe6e 100644 --- a/src/lang/KnownTranslationFactory.php +++ b/src/lang/KnownTranslationFactory.php @@ -1109,6 +1109,12 @@ final class KnownTranslationFactory{ return new Translatable(KnownTranslationKeys::POCKETMINE_COMMAND_ENCHANT_DESCRIPTION, []); } + public static function pocketmine_command_error_permission(Translatable|string $commandName) : Translatable{ + return new Translatable(KnownTranslationKeys::POCKETMINE_COMMAND_ERROR_PERMISSION, [ + "commandName" => $commandName, + ]); + } + public static function pocketmine_command_error_playerNotFound(Translatable|string $playerName) : Translatable{ return new Translatable(KnownTranslationKeys::POCKETMINE_COMMAND_ERROR_PLAYERNOTFOUND, [ "playerName" => $playerName, diff --git a/src/lang/KnownTranslationKeys.php b/src/lang/KnownTranslationKeys.php index e4301fa24..039642a96 100644 --- a/src/lang/KnownTranslationKeys.php +++ b/src/lang/KnownTranslationKeys.php @@ -244,6 +244,7 @@ final class KnownTranslationKeys{ public const POCKETMINE_COMMAND_DIFFICULTY_DESCRIPTION = "pocketmine.command.difficulty.description"; public const POCKETMINE_COMMAND_EFFECT_DESCRIPTION = "pocketmine.command.effect.description"; public const POCKETMINE_COMMAND_ENCHANT_DESCRIPTION = "pocketmine.command.enchant.description"; + public const POCKETMINE_COMMAND_ERROR_PERMISSION = "pocketmine.command.error.permission"; public const POCKETMINE_COMMAND_ERROR_PLAYERNOTFOUND = "pocketmine.command.error.playerNotFound"; public const POCKETMINE_COMMAND_EXCEPTION = "pocketmine.command.exception"; public const POCKETMINE_COMMAND_GAMEMODE_DESCRIPTION = "pocketmine.command.gamemode.description";