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

Rename BaseLang -> Language

Browse Source
This commit is contained in:
Dylan K. Taylor 2018-07-30 17:07:19 +01:00
parent d26631d8e0
commit 0d9952d53e
3 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/pocketmine/Server.php
View File

@ -45,7 +45,7 @@ use pocketmine\inventory\CraftingManager;
use pocketmine\item\enchantment\Enchantment; use pocketmine\item\enchantment\Enchantment;
use pocketmine\item\Item; use pocketmine\item\Item;
use pocketmine\item\ItemFactory; use pocketmine\item\ItemFactory;
use pocketmine\lang\BaseLang; use pocketmine\lang\Language;
use pocketmine\lang\LanguageNotFoundException; use pocketmine\lang\LanguageNotFoundException;
use pocketmine\lang\TextContainer; use pocketmine\lang\TextContainer;
use pocketmine\level\biome\Biome; use pocketmine\level\biome\Biome;
@ -243,8 +243,8 @@ class Server{
/** @var int */ /** @var int */
private $autoSaveTicks = 6000; private $autoSaveTicks = 6000;
/** @var BaseLang */ /** @var Language */
private $baseLang; private $language;
/** @var bool */ /** @var bool */
private $forceLanguage = false; private $forceLanguage = false;
@ -1443,15 +1443,15 @@ class Server{
define('pocketmine\DEBUG', (int) $this->getProperty("debug.level", 1)); define('pocketmine\DEBUG', (int) $this->getProperty("debug.level", 1));
$this->forceLanguage = (bool) $this->getProperty("settings.force-language", false); $this->forceLanguage = (bool) $this->getProperty("settings.force-language", false);
$selectedLang = $this->getProperty("settings.language", BaseLang::FALLBACK_LANGUAGE); $selectedLang = $this->getProperty("settings.language", Language::FALLBACK_LANGUAGE);
try{ try{
$this->baseLang = new BaseLang($selectedLang); $this->language = new Language($selectedLang);
}catch(LanguageNotFoundException $e){ }catch(LanguageNotFoundException $e){
$this->logger->error($e->getMessage()); $this->logger->error($e->getMessage());
try{ try{
$this->baseLang = new BaseLang(BaseLang::FALLBACK_LANGUAGE); $this->language = new Language(Language::FALLBACK_LANGUAGE);
}catch(LanguageNotFoundException $e){ }catch(LanguageNotFoundException $e){
$this->logger->emergency("Fallback language \"" . BaseLang::FALLBACK_LANGUAGE . "\" not found"); $this->logger->emergency("Fallback language \"" . Language::FALLBACK_LANGUAGE . "\" not found");
return; return;
} }
} }
@ -1460,19 +1460,19 @@ class Server{
if(\pocketmine\IS_DEVELOPMENT_BUILD){ if(\pocketmine\IS_DEVELOPMENT_BUILD){
if(!((bool) $this->getProperty("settings.enable-dev-builds", false))){ if(!((bool) $this->getProperty("settings.enable-dev-builds", false))){
$this->logger->emergency($this->baseLang->translateString("pocketmine.server.devBuild.error1", [\pocketmine\NAME])); $this->logger->emergency($this->language->translateString("pocketmine.server.devBuild.error1", [\pocketmine\NAME]));
$this->logger->emergency($this->baseLang->translateString("pocketmine.server.devBuild.error2")); $this->logger->emergency($this->language->translateString("pocketmine.server.devBuild.error2"));
$this->logger->emergency($this->baseLang->translateString("pocketmine.server.devBuild.error3")); $this->logger->emergency($this->language->translateString("pocketmine.server.devBuild.error3"));
$this->logger->emergency($this->baseLang->translateString("pocketmine.server.devBuild.error4", ["settings.enable-dev-builds"])); $this->logger->emergency($this->language->translateString("pocketmine.server.devBuild.error4", ["settings.enable-dev-builds"]));
$this->forceShutdown(); $this->forceShutdown();
return; return;
} }
$this->logger->warning(str_repeat("-", 40)); $this->logger->warning(str_repeat("-", 40));
$this->logger->warning($this->baseLang->translateString("pocketmine.server.devBuild.warning1", [\pocketmine\NAME])); $this->logger->warning($this->language->translateString("pocketmine.server.devBuild.warning1", [\pocketmine\NAME]));
$this->logger->warning($this->baseLang->translateString("pocketmine.server.devBuild.warning2")); $this->logger->warning($this->language->translateString("pocketmine.server.devBuild.warning2"));
$this->logger->warning($this->baseLang->translateString("pocketmine.server.devBuild.warning3")); $this->logger->warning($this->language->translateString("pocketmine.server.devBuild.warning3"));
$this->logger->warning(str_repeat("-", 40)); $this->logger->warning(str_repeat("-", 40));
} }
@ -2430,10 +2430,10 @@ class Server{
/** /**
* @return BaseLang * @return Language
*/ */
public function getLanguage(){ public function getLanguage(){
return $this->baseLang; return $this->language;
} }
/** /**

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

@ -23,7 +23,7 @@ declare(strict_types=1);
namespace pocketmine\lang; namespace pocketmine\lang;
class BaseLang{ class Language{
public const FALLBACK_LANGUAGE = "eng"; public const FALLBACK_LANGUAGE = "eng";

8
src/pocketmine/wizard/SetupWizard.php
View File

@ -27,7 +27,7 @@ declare(strict_types=1);
*/ */
namespace pocketmine\wizard; namespace pocketmine\wizard;
use pocketmine\lang\BaseLang; use pocketmine\lang\Language;
use pocketmine\lang\LanguageNotFoundException; use pocketmine\lang\LanguageNotFoundException;
use pocketmine\utils\Config; use pocketmine\utils\Config;
use pocketmine\utils\Internet; use pocketmine\utils\Internet;
@ -38,7 +38,7 @@ class SetupWizard{
public const DEFAULT_PLAYERS = 20; public const DEFAULT_PLAYERS = 20;
public const DEFAULT_GAMEMODE = 0; public const DEFAULT_GAMEMODE = 0;
/** @var BaseLang */ /** @var Language */
private $lang; private $lang;
public function __construct(){ public function __construct(){
@ -49,7 +49,7 @@ class SetupWizard{
$this->message(\pocketmine\NAME . " set-up wizard"); $this->message(\pocketmine\NAME . " set-up wizard");
try{ try{
$langs = BaseLang::getLanguageList(); $langs = Language::getLanguageList();
}catch(LanguageNotFoundException $e){ }catch(LanguageNotFoundException $e){
$this->error("No language files found, please use provided builds or clone the repository recursively."); $this->error("No language files found, please use provided builds or clone the repository recursively.");
return false; return false;
@ -68,7 +68,7 @@ class SetupWizard{
} }
}while($lang === null); }while($lang === null);
$this->lang = new BaseLang($lang); $this->lang = new Language($lang);
$this->message($this->lang->get("language_has_been_selected")); $this->message($this->lang->get("language_has_been_selected"));