From 273aa8ab4258dd86b4abba7edf64da91ce8adbf6 Mon Sep 17 00:00:00 2001 From: "Dylan K. Taylor" Date: Sat, 11 Sep 2021 17:06:26 +0100 Subject: [PATCH] Drop useless usage translation strings for commands with no parameters --- resources/locale | 2 +- .../defaults/GarbageCollectorCommand.php | 3 +- src/command/defaults/ListCommand.php | 3 +- src/command/defaults/PluginsCommand.php | 2 +- src/command/defaults/SaveCommand.php | 3 +- src/command/defaults/SaveOffCommand.php | 3 +- src/command/defaults/SaveOnCommand.php | 3 +- src/command/defaults/SeedCommand.php | 3 +- src/command/defaults/StatusCommand.php | 3 +- src/command/defaults/StopCommand.php | 3 +- src/lang/KnownTranslationFactory.php | 36 ------------------- src/lang/KnownTranslationKeys.php | 9 ----- 12 files changed, 10 insertions(+), 63 deletions(-) diff --git a/resources/locale b/resources/locale index 95b9c82f2..4a322da43 160000 --- a/resources/locale +++ b/resources/locale @@ -1 +1 @@ -Subproject commit 95b9c82f25f2d216683769c326c06c88706ce3cc +Subproject commit 4a322da43eb9beef727bd36be3d6b641b8316591 diff --git a/src/command/defaults/GarbageCollectorCommand.php b/src/command/defaults/GarbageCollectorCommand.php index 2a2ccf49c..1081ac52e 100644 --- a/src/command/defaults/GarbageCollectorCommand.php +++ b/src/command/defaults/GarbageCollectorCommand.php @@ -37,8 +37,7 @@ class GarbageCollectorCommand extends VanillaCommand{ public function __construct(string $name){ parent::__construct( $name, - KnownTranslationFactory::pocketmine_command_gc_description(), - KnownTranslationFactory::pocketmine_command_gc_usage() + KnownTranslationFactory::pocketmine_command_gc_description() ); $this->setPermission(DefaultPermissionNames::COMMAND_GC); } diff --git a/src/command/defaults/ListCommand.php b/src/command/defaults/ListCommand.php index 5de2e6697..a19130e3f 100644 --- a/src/command/defaults/ListCommand.php +++ b/src/command/defaults/ListCommand.php @@ -39,8 +39,7 @@ class ListCommand extends VanillaCommand{ public function __construct(string $name){ parent::__construct( $name, - KnownTranslationFactory::pocketmine_command_list_description(), - KnownTranslationFactory::commands_players_usage() + KnownTranslationFactory::pocketmine_command_list_description() ); $this->setPermission(DefaultPermissionNames::COMMAND_LIST); } diff --git a/src/command/defaults/PluginsCommand.php b/src/command/defaults/PluginsCommand.php index 3ae8d19a2..2b4ef9ad6 100644 --- a/src/command/defaults/PluginsCommand.php +++ b/src/command/defaults/PluginsCommand.php @@ -40,7 +40,7 @@ class PluginsCommand extends VanillaCommand{ parent::__construct( $name, KnownTranslationFactory::pocketmine_command_plugins_description(), - KnownTranslationFactory::pocketmine_command_plugins_usage(), + null, ["pl"] ); $this->setPermission(DefaultPermissionNames::COMMAND_PLUGINS); diff --git a/src/command/defaults/SaveCommand.php b/src/command/defaults/SaveCommand.php index 9fe3cf197..ae31cb18a 100644 --- a/src/command/defaults/SaveCommand.php +++ b/src/command/defaults/SaveCommand.php @@ -35,8 +35,7 @@ class SaveCommand extends VanillaCommand{ public function __construct(string $name){ parent::__construct( $name, - KnownTranslationFactory::pocketmine_command_save_description(), - KnownTranslationFactory::commands_save_usage() + KnownTranslationFactory::pocketmine_command_save_description() ); $this->setPermission(DefaultPermissionNames::COMMAND_SAVE_PERFORM); } diff --git a/src/command/defaults/SaveOffCommand.php b/src/command/defaults/SaveOffCommand.php index 5dd39f6f3..223d81e64 100644 --- a/src/command/defaults/SaveOffCommand.php +++ b/src/command/defaults/SaveOffCommand.php @@ -33,8 +33,7 @@ class SaveOffCommand extends VanillaCommand{ public function __construct(string $name){ parent::__construct( $name, - KnownTranslationFactory::pocketmine_command_saveoff_description(), - KnownTranslationFactory::commands_save_off_usage() + KnownTranslationFactory::pocketmine_command_saveoff_description() ); $this->setPermission(DefaultPermissionNames::COMMAND_SAVE_DISABLE); } diff --git a/src/command/defaults/SaveOnCommand.php b/src/command/defaults/SaveOnCommand.php index 1bbdd5a0b..0999181a9 100644 --- a/src/command/defaults/SaveOnCommand.php +++ b/src/command/defaults/SaveOnCommand.php @@ -33,8 +33,7 @@ class SaveOnCommand extends VanillaCommand{ public function __construct(string $name){ parent::__construct( $name, - KnownTranslationFactory::pocketmine_command_saveon_description(), - KnownTranslationFactory::commands_save_on_usage() + KnownTranslationFactory::pocketmine_command_saveon_description() ); $this->setPermission(DefaultPermissionNames::COMMAND_SAVE_ENABLE); } diff --git a/src/command/defaults/SeedCommand.php b/src/command/defaults/SeedCommand.php index 364c9d003..50e106145 100644 --- a/src/command/defaults/SeedCommand.php +++ b/src/command/defaults/SeedCommand.php @@ -33,8 +33,7 @@ class SeedCommand extends VanillaCommand{ public function __construct(string $name){ parent::__construct( $name, - KnownTranslationFactory::pocketmine_command_seed_description(), - KnownTranslationFactory::commands_seed_usage() + KnownTranslationFactory::pocketmine_command_seed_description() ); $this->setPermission(DefaultPermissionNames::COMMAND_SEED); } diff --git a/src/command/defaults/StatusCommand.php b/src/command/defaults/StatusCommand.php index 7ccbbb313..05dfc7abf 100644 --- a/src/command/defaults/StatusCommand.php +++ b/src/command/defaults/StatusCommand.php @@ -39,8 +39,7 @@ class StatusCommand extends VanillaCommand{ public function __construct(string $name){ parent::__construct( $name, - KnownTranslationFactory::pocketmine_command_status_description(), - KnownTranslationFactory::pocketmine_command_status_usage() + KnownTranslationFactory::pocketmine_command_status_description() ); $this->setPermission(DefaultPermissionNames::COMMAND_STATUS); } diff --git a/src/command/defaults/StopCommand.php b/src/command/defaults/StopCommand.php index 3292cd7c6..256208714 100644 --- a/src/command/defaults/StopCommand.php +++ b/src/command/defaults/StopCommand.php @@ -33,8 +33,7 @@ class StopCommand extends VanillaCommand{ public function __construct(string $name){ parent::__construct( $name, - KnownTranslationFactory::pocketmine_command_stop_description(), - KnownTranslationFactory::commands_stop_usage() + KnownTranslationFactory::pocketmine_command_stop_description() ); $this->setPermission(DefaultPermissionNames::COMMAND_STOP); } diff --git a/src/lang/KnownTranslationFactory.php b/src/lang/KnownTranslationFactory.php index 96eac592c..62577ee16 100644 --- a/src/lang/KnownTranslationFactory.php +++ b/src/lang/KnownTranslationFactory.php @@ -405,18 +405,6 @@ final class KnownTranslationFactory{ ]); } - public static function commands_players_usage() : Translatable{ - return new Translatable(KnownTranslationKeys::COMMANDS_PLAYERS_USAGE, []); - } - - public static function commands_save_off_usage() : Translatable{ - return new Translatable(KnownTranslationKeys::COMMANDS_SAVE_OFF_USAGE, []); - } - - public static function commands_save_on_usage() : Translatable{ - return new Translatable(KnownTranslationKeys::COMMANDS_SAVE_ON_USAGE, []); - } - public static function commands_save_disabled() : Translatable{ return new Translatable(KnownTranslationKeys::COMMANDS_SAVE_DISABLED, []); } @@ -433,10 +421,6 @@ final class KnownTranslationFactory{ return new Translatable(KnownTranslationKeys::COMMANDS_SAVE_SUCCESS, []); } - public static function commands_save_usage() : Translatable{ - return new Translatable(KnownTranslationKeys::COMMANDS_SAVE_USAGE, []); - } - public static function commands_say_usage() : Translatable{ return new Translatable(KnownTranslationKeys::COMMANDS_SAY_USAGE, []); } @@ -447,10 +431,6 @@ final class KnownTranslationFactory{ ]); } - public static function commands_seed_usage() : Translatable{ - return new Translatable(KnownTranslationKeys::COMMANDS_SEED_USAGE, []); - } - public static function commands_setworldspawn_success(Translatable|string $param0, Translatable|string $param1, Translatable|string $param2) : Translatable{ return new Translatable(KnownTranslationKeys::COMMANDS_SETWORLDSPAWN_SUCCESS, [ 0 => $param0, @@ -480,10 +460,6 @@ final class KnownTranslationFactory{ return new Translatable(KnownTranslationKeys::COMMANDS_STOP_START, []); } - public static function commands_stop_usage() : Translatable{ - return new Translatable(KnownTranslationKeys::COMMANDS_STOP_USAGE, []); - } - public static function commands_time_added(Translatable|string $param0) : Translatable{ return new Translatable(KnownTranslationKeys::COMMANDS_TIME_ADDED, [ 0 => $param0, @@ -1171,10 +1147,6 @@ final class KnownTranslationFactory{ ]); } - public static function pocketmine_command_gc_usage() : Translatable{ - return new Translatable(KnownTranslationKeys::POCKETMINE_COMMAND_GC_USAGE, []); - } - public static function pocketmine_command_give_description() : Translatable{ return new Translatable(KnownTranslationKeys::POCKETMINE_COMMAND_GIVE_DESCRIPTION, []); } @@ -1230,10 +1202,6 @@ final class KnownTranslationFactory{ ]); } - public static function pocketmine_command_plugins_usage() : Translatable{ - return new Translatable(KnownTranslationKeys::POCKETMINE_COMMAND_PLUGINS_USAGE, []); - } - public static function pocketmine_command_save_description() : Translatable{ return new Translatable(KnownTranslationKeys::POCKETMINE_COMMAND_SAVE_DESCRIPTION, []); } @@ -1266,10 +1234,6 @@ final class KnownTranslationFactory{ return new Translatable(KnownTranslationKeys::POCKETMINE_COMMAND_STATUS_DESCRIPTION, []); } - public static function pocketmine_command_status_usage() : Translatable{ - return new Translatable(KnownTranslationKeys::POCKETMINE_COMMAND_STATUS_USAGE, []); - } - public static function pocketmine_command_stop_description() : Translatable{ return new Translatable(KnownTranslationKeys::POCKETMINE_COMMAND_STOP_DESCRIPTION, []); } diff --git a/src/lang/KnownTranslationKeys.php b/src/lang/KnownTranslationKeys.php index 3e9b90eb2..5c3d5bfa3 100644 --- a/src/lang/KnownTranslationKeys.php +++ b/src/lang/KnownTranslationKeys.php @@ -95,23 +95,17 @@ final class KnownTranslationKeys{ public const COMMANDS_PARTICLE_NOTFOUND = "commands.particle.notFound"; public const COMMANDS_PARTICLE_SUCCESS = "commands.particle.success"; public const COMMANDS_PLAYERS_LIST = "commands.players.list"; - public const COMMANDS_PLAYERS_USAGE = "commands.players.usage"; - public const COMMANDS_SAVE_OFF_USAGE = "commands.save-off.usage"; - public const COMMANDS_SAVE_ON_USAGE = "commands.save-on.usage"; public const COMMANDS_SAVE_DISABLED = "commands.save.disabled"; public const COMMANDS_SAVE_ENABLED = "commands.save.enabled"; public const COMMANDS_SAVE_START = "commands.save.start"; public const COMMANDS_SAVE_SUCCESS = "commands.save.success"; - public const COMMANDS_SAVE_USAGE = "commands.save.usage"; public const COMMANDS_SAY_USAGE = "commands.say.usage"; public const COMMANDS_SEED_SUCCESS = "commands.seed.success"; - public const COMMANDS_SEED_USAGE = "commands.seed.usage"; public const COMMANDS_SETWORLDSPAWN_SUCCESS = "commands.setworldspawn.success"; public const COMMANDS_SETWORLDSPAWN_USAGE = "commands.setworldspawn.usage"; public const COMMANDS_SPAWNPOINT_SUCCESS = "commands.spawnpoint.success"; public const COMMANDS_SPAWNPOINT_USAGE = "commands.spawnpoint.usage"; public const COMMANDS_STOP_START = "commands.stop.start"; - public const COMMANDS_STOP_USAGE = "commands.stop.usage"; public const COMMANDS_TIME_ADDED = "commands.time.added"; public const COMMANDS_TIME_QUERY = "commands.time.query"; public const COMMANDS_TIME_SET = "commands.time.set"; @@ -257,7 +251,6 @@ final class KnownTranslationKeys{ 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"; public const POCKETMINE_COMMAND_HELP_DESCRIPTION = "pocketmine.command.help.description"; @@ -271,7 +264,6 @@ final class KnownTranslationKeys{ public const POCKETMINE_COMMAND_PARTICLE_USAGE = "pocketmine.command.particle.usage"; public const POCKETMINE_COMMAND_PLUGINS_DESCRIPTION = "pocketmine.command.plugins.description"; public const POCKETMINE_COMMAND_PLUGINS_SUCCESS = "pocketmine.command.plugins.success"; - public const POCKETMINE_COMMAND_PLUGINS_USAGE = "pocketmine.command.plugins.usage"; public const POCKETMINE_COMMAND_SAVE_DESCRIPTION = "pocketmine.command.save.description"; public const POCKETMINE_COMMAND_SAVEOFF_DESCRIPTION = "pocketmine.command.saveoff.description"; public const POCKETMINE_COMMAND_SAVEON_DESCRIPTION = "pocketmine.command.saveon.description"; @@ -280,7 +272,6 @@ final class KnownTranslationKeys{ public const POCKETMINE_COMMAND_SETWORLDSPAWN_DESCRIPTION = "pocketmine.command.setworldspawn.description"; public const POCKETMINE_COMMAND_SPAWNPOINT_DESCRIPTION = "pocketmine.command.spawnpoint.description"; public const POCKETMINE_COMMAND_STATUS_DESCRIPTION = "pocketmine.command.status.description"; - public const POCKETMINE_COMMAND_STATUS_USAGE = "pocketmine.command.status.usage"; public const POCKETMINE_COMMAND_STOP_DESCRIPTION = "pocketmine.command.stop.description"; public const POCKETMINE_COMMAND_TELL_DESCRIPTION = "pocketmine.command.tell.description"; public const POCKETMINE_COMMAND_TIME_DESCRIPTION = "pocketmine.command.time.description";