Merge branch 'release/3.2'

This commit is contained in:
Dylan K. Taylor 2018-08-06 20:53:16 +01:00
commit e5b69deccf
2 changed files with 4 additions and 4 deletions

@ -1 +1 @@
Subproject commit 91e77ffbce10b0c56ae019655a3e803856b93a74 Subproject commit 66c471358956c4c826837868af04eab08f3cfdbf

View File

@ -93,7 +93,7 @@ class SetupWizard{
} }
private function showLicense() : bool{ private function showLicense() : bool{
$this->message($this->lang->get("welcome_to_pocketmine")); $this->message($this->lang->translateString("welcome_to_pocketmine", [\pocketmine\NAME]));
echo <<<LICENSE echo <<<LICENSE
This program is free software: you can redistribute it and/or modify This program is free software: you can redistribute it and/or modify
@ -104,7 +104,7 @@ class SetupWizard{
LICENSE; LICENSE;
$this->writeLine(); $this->writeLine();
if(strtolower($this->getInput($this->lang->get("accept_license"), "n", "y/N")) !== "y"){ if(strtolower($this->getInput($this->lang->get("accept_license"), "n", "y/N")) !== "y"){
$this->error($this->lang->get("you_have_to_accept_the_license")); $this->error($this->lang->translateString("you_have_to_accept_the_license", [\pocketmine\NAME]));
sleep(5); sleep(5);
return false; return false;
@ -221,7 +221,7 @@ LICENSE;
private function endWizard(){ private function endWizard(){
$this->message($this->lang->get("you_have_finished")); $this->message($this->lang->get("you_have_finished"));
$this->message($this->lang->get("pocketmine_plugins")); $this->message($this->lang->get("pocketmine_plugins"));
$this->message($this->lang->get("pocketmine_will_start")); $this->message($this->lang->translateString("pocketmine_will_start", [\pocketmine\NAME]));
$this->writeLine(); $this->writeLine();
$this->writeLine(); $this->writeLine();