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

Fixed language selection

Browse Source
This commit is contained in:
Shoghi Cervantes 2015-04-11 15:37:44 +02:00
parent 5a0d1affcc
commit 3cf42b558c
No known key found for this signature in database
GPG Key ID: 78464DB0A7837F89
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/pocketmine/Server.php
View File

@ -1515,7 +1515,7 @@ class Server{
"auto-save" => true,
]);
$this->baseLang = new BaseLang($this->getProperty("settings.settings.language", BaseLang::FALLBACK_LANGUAGE));
$this->baseLang = new BaseLang($this->getProperty("settings.language", BaseLang::FALLBACK_LANGUAGE));
$this->logger->info($this->getLanguage()->translateString("language.selected", [$this->getLanguage()->getName(), $this->getLanguage()->getLang()]));
$this->logger->info($this->getLanguage()->translateString("pocketmine.server.start", [TextFormat::AQUA . $this->getVersion()]));

2
src/pocketmine/lang/BaseLang.php
View File

@ -97,7 +97,7 @@ class BaseLang{
public function translate(TextContainer $c){
if($c instanceof TranslationContainer){
$baseText = $this->get($c->getText());
$baseText = $this->internalGet($c->getText());
$baseText = $this->parseTranslation( $baseText !== null ? $baseText : $c->getText());
foreach($c->getParameters() as $i => $p){