mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-09-04 00:55:14 +00:00
Code Issues Projects Releases Wiki Activity

Stop auto-translating strings when not asked

Browse Source 
fixes #4371
This commit is contained in:
Dylan K. Taylor
2021-08-15 20:44:27 +01:00
parent a81680c5c6
commit 5da90b9530
4 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/console/ConsoleCommandSender.php
View File

@ -62,8 +62,6 @@ class ConsoleCommandSender implements CommandSender{
$server = $this->getServer(); $server = $this->getServer();
if($message instanceof Translatable){ if($message instanceof Translatable){
$message = $this->getLanguage()->translate($message); $message = $this->getLanguage()->translate($message);
}else{
$message = $this->getLanguage()->translateString($message);
} }
foreach(explode("\n", trim($message)) as $line){ foreach(explode("\n", trim($message)) as $line){

4
src/lang/Language.php
View File

@ -137,7 +137,7 @@ class Language{
$baseText = $this->parseTranslation(($onlyPrefix === null or strpos($str, $onlyPrefix) === 0) ? $baseText : $str, $onlyPrefix); $baseText = $this->parseTranslation(($onlyPrefix === null or strpos($str, $onlyPrefix) === 0) ? $baseText : $str, $onlyPrefix);
foreach($params as $i => $p){ 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); $baseText = str_replace("{%$i}", $replacement, $baseText);
} }
@ -149,7 +149,7 @@ class Language{
$baseText = $this->parseTranslation($baseText ?? $c->getText()); $baseText = $this->parseTranslation($baseText ?? $c->getText());
foreach($c->getParameters() as $i => $p){ 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); $baseText = str_replace("{%$i}", $replacement, $baseText);
} }

2
src/network/mcpe/NetworkSession.php
View File

@ -582,7 +582,7 @@ class NetworkSession{
} }
if($error !== null){ 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; return;
} }

2
src/player/Player.php
View File

@ -1779,7 +1779,7 @@ class Player extends Human implements CommandSender, ChunkListener, IPlayer{
return; return;
} }
$this->getNetworkSession()->onRawChatMessage($this->getLanguage()->translateString($message)); $this->getNetworkSession()->onRawChatMessage($message);
} }
/** /**