diff --git a/src/console/ConsoleCommandSender.php b/src/console/ConsoleCommandSender.php index 3d2feb762..45ae2f5ab 100644 --- a/src/console/ConsoleCommandSender.php +++ b/src/console/ConsoleCommandSender.php @@ -62,8 +62,6 @@ class ConsoleCommandSender implements CommandSender{ $server = $this->getServer(); if($message instanceof Translatable){ $message = $this->getLanguage()->translate($message); - }else{ - $message = $this->getLanguage()->translateString($message); } foreach(explode("\n", trim($message)) as $line){ diff --git a/src/lang/Language.php b/src/lang/Language.php index ea8171dfd..f3e966704 100644 --- a/src/lang/Language.php +++ b/src/lang/Language.php @@ -137,7 +137,7 @@ class Language{ $baseText = $this->parseTranslation(($onlyPrefix === null or strpos($str, $onlyPrefix) === 0) ? $baseText : $str, $onlyPrefix); foreach($params as $i => $p){ - $replacement = $p instanceof Translatable ? $this->translate($p) : $this->internalGet((string) $p) ?? $this->parseTranslation((string) $p); + $replacement = $p instanceof Translatable ? $this->translate($p) : (string) $p; $baseText = str_replace("{%$i}", $replacement, $baseText); } @@ -149,7 +149,7 @@ class Language{ $baseText = $this->parseTranslation($baseText ?? $c->getText()); foreach($c->getParameters() as $i => $p){ - $replacement = $p instanceof Translatable ? $this->translate($p) : $this->internalGet($p) ?? $this->parseTranslation($p); + $replacement = $p instanceof Translatable ? $this->translate($p) : $p; $baseText = str_replace("{%$i}", $replacement, $baseText); } diff --git a/src/network/mcpe/NetworkSession.php b/src/network/mcpe/NetworkSession.php index a8c68f8e8..4683c2c72 100644 --- a/src/network/mcpe/NetworkSession.php +++ b/src/network/mcpe/NetworkSession.php @@ -582,7 +582,7 @@ class NetworkSession{ } if($error !== null){ - $this->disconnect($this->server->getLanguage()->translate(KnownTranslationFactory::pocketmine_disconnect_invalidSession($error))); + $this->disconnect($this->server->getLanguage()->translate(KnownTranslationFactory::pocketmine_disconnect_invalidSession($this->server->getLanguage()->translateString($error)))); return; } diff --git a/src/player/Player.php b/src/player/Player.php index 7ecb53b4f..9b102396a 100644 --- a/src/player/Player.php +++ b/src/player/Player.php @@ -1779,7 +1779,7 @@ class Player extends Human implements CommandSender, ChunkListener, IPlayer{ return; } - $this->getNetworkSession()->onRawChatMessage($this->getLanguage()->translateString($message)); + $this->getNetworkSession()->onRawChatMessage($message); } /**