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

Start using webmozart/pathutil for joining paths (#4287)

Browse Source
This commit is contained in:
Dylan T
2021-06-29 19:40:43 +01:00
committed by GitHub
parent aee7b03c1d
commit 32d7b1e6af
31 changed files with 252 additions and 172 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/lang/Language.php
View File

@@ -23,6 +23,7 @@ declare(strict_types=1);
namespace pocketmine\lang;
use Webmozart\PathUtil\Path;
use function array_filter;
use function array_map;
use function explode;
@@ -51,7 +52,7 @@ class Language{
*/
public static function getLanguageList(string $path = "") : array{
if($path === ""){
$path = \pocketmine\RESOURCE_PATH . "locale/";
$path = Path::join(\pocketmine\RESOURCE_PATH, "locale");
}
if(is_dir($path)){
@@ -100,7 +101,7 @@ class Language{
$this->langName = strtolower($lang);
if($path === null){
$path = \pocketmine\RESOURCE_PATH . "locale/";
$path = Path::join(\pocketmine\RESOURCE_PATH, "locale");
}
$this->lang = self::loadLang($path, $this->langName);
@@ -120,7 +121,7 @@ class Language{
* @phpstan-return array<string, string>
*/
protected static function loadLang(string $path, string $languageCode) : array{
$file = $path . $languageCode . ".ini";
$file = Path::join($path, $languageCode . ".ini");
if(file_exists($file)){
return array_map('\stripcslashes', parse_ini_file($file, false, INI_SCANNER_RAW));
}