mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-10-19 23:37:45 +00:00
Code Issues Projects Releases Wiki Activity

Updated some more hardcoded translation key usages missed by 94e16f416d

Browse Source
This commit is contained in:
Dylan K. Taylor
2021-06-30 14:02:55 +01:00
parent 76a74b3931
commit f3bd48e6cb
4 changed files with 29 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/command/defaults/GiveCommand.php
View File

@@ -59,14 +59,14 @@ class GiveCommand extends VanillaCommand{
$player = $sender->getServer()->getPlayerByPrefix($args[0]);
if($player === null){
$sender->sendMessage(new TranslationContainer(TextFormat::RED . "%commands.generic.player.notFound"));
$sender->sendMessage(new TranslationContainer(TextFormat::RED . "%" . KnownTranslationKeys::COMMANDS_GENERIC_PLAYER_NOTFOUND));
return true;
}
try{
$item = LegacyStringToItemParser::getInstance()->parse($args[1]);
}catch(\InvalidArgumentException $e){
$sender->sendMessage(new TranslationContainer(TextFormat::RED . "%commands.give.item.notFound", [$args[1]]));
$sender->sendMessage(new TranslationContainer(TextFormat::RED . "%" . KnownTranslationKeys::COMMANDS_GIVE_ITEM_NOTFOUND, [$args[1]]));
return true;
}
@@ -81,7 +81,7 @@ class GiveCommand extends VanillaCommand{
try{
$tags = JsonNbtParser::parseJson($data);
}catch(NbtDataException $e){
$sender->sendMessage(new TranslationContainer("commands.give.tagError", [$e->getMessage()]));
$sender->sendMessage(new TranslationContainer(KnownTranslationKeys::COMMANDS_GIVE_TAGERROR, [$e->getMessage()]));
return true;
}
@@ -91,7 +91,7 @@ class GiveCommand extends VanillaCommand{
//TODO: overflow
$player->getInventory()->addItem(clone $item);
Command::broadcastCommandMessage($sender, new TranslationContainer("%commands.give.success", [
Command::broadcastCommandMessage($sender, new TranslationContainer(KnownTranslationKeys::COMMANDS_GIVE_SUCCESS, [
$item->getName() . " (" . $item->getId() . ":" . $item->getMeta() . ")",
(string) $item->getCount(),
$player->getName()

5
src/command/defaults/VanillaCommand.php
View File

@@ -26,6 +26,7 @@ namespace pocketmine\command\defaults;
use pocketmine\command\Command;
use pocketmine\command\CommandSender;
use pocketmine\command\utils\InvalidCommandSyntaxException;
use pocketmine\lang\KnownTranslationKeys;
use pocketmine\lang\TranslationContainer;
use pocketmine\utils\TextFormat;
use function is_numeric;
@@ -82,11 +83,11 @@ abstract class VanillaCommand extends Command{
$v = (int) $input;
if($v > $max){
$sender->sendMessage(new TranslationContainer(TextFormat::RED . "%commands.generic.num.tooBig", [$input, (string) $max]));
$sender->sendMessage(new TranslationContainer(TextFormat::RED . "%" . KnownTranslationKeys::COMMANDS_GENERIC_NUM_TOOBIG, [$input, (string) $max]));
return null;
}
if($v < $min){
$sender->sendMessage(new TranslationContainer(TextFormat::RED . "%commands.generic.num.tooSmall", [$input, (string) $min]));
$sender->sendMessage(new TranslationContainer(TextFormat::RED . "%" . KnownTranslationKeys::COMMANDS_GENERIC_NUM_TOOSMALL, [$input, (string) $min]));
return null;
}