From e140614a6378faf64950f770c32331c8fe8afeee Mon Sep 17 00:00:00 2001 From: "Dylan K. Taylor" Date: Thu, 26 Aug 2021 15:06:43 +0100 Subject: [PATCH] Localize /gc --- resources/locale | 2 +- .../defaults/GarbageCollectorCommand.php | 11 ++++---- src/lang/KnownTranslationFactory.php | 28 +++++++++++++++++++ src/lang/KnownTranslationKeys.php | 5 ++++ 4 files changed, 40 insertions(+), 6 deletions(-) diff --git a/resources/locale b/resources/locale index 1332ae273..558e260fc 160000 --- a/resources/locale +++ b/resources/locale @@ -1 +1 @@ -Subproject commit 1332ae273aefc6faf1c62fb62244050e75c4f5e1 +Subproject commit 558e260fc5bfee5f0de8ce701be93eeac184f454 diff --git a/src/command/defaults/GarbageCollectorCommand.php b/src/command/defaults/GarbageCollectorCommand.php index 47d1dba81..1614739cd 100644 --- a/src/command/defaults/GarbageCollectorCommand.php +++ b/src/command/defaults/GarbageCollectorCommand.php @@ -24,6 +24,7 @@ declare(strict_types=1); namespace pocketmine\command\defaults; use pocketmine\command\CommandSender; +use pocketmine\lang\KnownTranslationFactory; use pocketmine\lang\KnownTranslationKeys; use pocketmine\permission\DefaultPermissionNames; use pocketmine\utils\TextFormat; @@ -64,12 +65,12 @@ class GarbageCollectorCommand extends VanillaCommand{ $cyclesCollected = $sender->getServer()->getMemoryManager()->triggerGarbageCollector(); - $sender->sendMessage(TextFormat::GREEN . "---- " . TextFormat::WHITE . "Garbage collection result" . TextFormat::GREEN . " ----"); - $sender->sendMessage(TextFormat::GOLD . "Chunks: " . TextFormat::RED . number_format($chunksCollected)); - $sender->sendMessage(TextFormat::GOLD . "Entities: " . TextFormat::RED . number_format($entitiesCollected)); + $sender->sendMessage(KnownTranslationFactory::pocketmine_command_gc_header()->format(TextFormat::GREEN . "---- " . TextFormat::WHITE, TextFormat::GREEN . " ----" . TextFormat::WHITE)); + $sender->sendMessage(KnownTranslationFactory::pocketmine_command_gc_chunks(TextFormat::RED . number_format($chunksCollected))->prefix(TextFormat::GOLD)); + $sender->sendMessage(KnownTranslationFactory::pocketmine_command_gc_entities(TextFormat::RED . number_format($entitiesCollected))->prefix(TextFormat::GOLD)); - $sender->sendMessage(TextFormat::GOLD . "Cycles: " . TextFormat::RED . number_format($cyclesCollected)); - $sender->sendMessage(TextFormat::GOLD . "Memory freed: " . TextFormat::RED . number_format(round((($memory - memory_get_usage()) / 1024) / 1024, 2), 2) . " MB"); + $sender->sendMessage(KnownTranslationFactory::pocketmine_command_gc_cycles(TextFormat::RED . number_format($cyclesCollected))->prefix(TextFormat::GOLD)); + $sender->sendMessage(KnownTranslationFactory::pocketmine_command_gc_memoryFreed(TextFormat::RED . number_format(round((($memory - memory_get_usage()) / 1024) / 1024, 2), 2) . " MB")->prefix(TextFormat::GOLD)); return true; } } diff --git a/src/lang/KnownTranslationFactory.php b/src/lang/KnownTranslationFactory.php index 29615de91..e390b01a4 100644 --- a/src/lang/KnownTranslationFactory.php +++ b/src/lang/KnownTranslationFactory.php @@ -991,10 +991,38 @@ final class KnownTranslationFactory{ return new Translatable(KnownTranslationKeys::POCKETMINE_COMMAND_GAMEMODE_DESCRIPTION, []); } + public static function pocketmine_command_gc_chunks(Translatable|string $chunksCollected) : Translatable{ + return new Translatable(KnownTranslationKeys::POCKETMINE_COMMAND_GC_CHUNKS, [ + "chunksCollected" => $chunksCollected, + ]); + } + + public static function pocketmine_command_gc_cycles(Translatable|string $cyclesCollected) : Translatable{ + return new Translatable(KnownTranslationKeys::POCKETMINE_COMMAND_GC_CYCLES, [ + "cyclesCollected" => $cyclesCollected, + ]); + } + public static function pocketmine_command_gc_description() : Translatable{ return new Translatable(KnownTranslationKeys::POCKETMINE_COMMAND_GC_DESCRIPTION, []); } + public static function pocketmine_command_gc_entities(Translatable|string $entitiesCollected) : Translatable{ + return new Translatable(KnownTranslationKeys::POCKETMINE_COMMAND_GC_ENTITIES, [ + "entitiesCollected" => $entitiesCollected, + ]); + } + + public static function pocketmine_command_gc_header() : Translatable{ + return new Translatable(KnownTranslationKeys::POCKETMINE_COMMAND_GC_HEADER, []); + } + + public static function pocketmine_command_gc_memoryFreed(Translatable|string $memoryFreed) : Translatable{ + return new Translatable(KnownTranslationKeys::POCKETMINE_COMMAND_GC_MEMORYFREED, [ + "memoryFreed" => $memoryFreed, + ]); + } + public static function pocketmine_command_gc_usage() : Translatable{ return new Translatable(KnownTranslationKeys::POCKETMINE_COMMAND_GC_USAGE, []); } diff --git a/src/lang/KnownTranslationKeys.php b/src/lang/KnownTranslationKeys.php index a5eea3c50..1c1de33c3 100644 --- a/src/lang/KnownTranslationKeys.php +++ b/src/lang/KnownTranslationKeys.php @@ -214,7 +214,12 @@ final class KnownTranslationKeys{ public const POCKETMINE_COMMAND_ENCHANT_DESCRIPTION = "pocketmine.command.enchant.description"; public const POCKETMINE_COMMAND_EXCEPTION = "pocketmine.command.exception"; public const POCKETMINE_COMMAND_GAMEMODE_DESCRIPTION = "pocketmine.command.gamemode.description"; + public const POCKETMINE_COMMAND_GC_CHUNKS = "pocketmine.command.gc.chunks"; + public const POCKETMINE_COMMAND_GC_CYCLES = "pocketmine.command.gc.cycles"; public const POCKETMINE_COMMAND_GC_DESCRIPTION = "pocketmine.command.gc.description"; + public const POCKETMINE_COMMAND_GC_ENTITIES = "pocketmine.command.gc.entities"; + public const POCKETMINE_COMMAND_GC_HEADER = "pocketmine.command.gc.header"; + public const POCKETMINE_COMMAND_GC_MEMORYFREED = "pocketmine.command.gc.memoryFreed"; public const POCKETMINE_COMMAND_GC_USAGE = "pocketmine.command.gc.usage"; public const POCKETMINE_COMMAND_GIVE_DESCRIPTION = "pocketmine.command.give.description"; public const POCKETMINE_COMMAND_GIVE_USAGE = "pocketmine.command.give.usage";