From c201a0e909d9e8212657c7b072d6c620895e3013 Mon Sep 17 00:00:00 2001 From: "Dylan K. Taylor" Date: Mon, 5 Nov 2018 09:49:21 +0000 Subject: [PATCH] Move language submodule to resources/ again, this isn't source code. --- .gitmodules | 2 +- {src/pocketmine/lang => resources}/locale | 0 src/pocketmine/lang/Language.php | 4 ++-- 3 files changed, 3 insertions(+), 3 deletions(-) rename {src/pocketmine/lang => resources}/locale (100%) diff --git a/.gitmodules b/.gitmodules index 21adfef04..ffdd6fb4f 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,5 +1,5 @@ [submodule "src/pocketmine/lang/locale"] - path = src/pocketmine/lang/locale + path = resources/locale url = https://github.com/pmmp/PocketMine-Language.git [submodule "tests/preprocessor"] path = tests/preprocessor diff --git a/src/pocketmine/lang/locale b/resources/locale similarity index 100% rename from src/pocketmine/lang/locale rename to resources/locale diff --git a/src/pocketmine/lang/Language.php b/src/pocketmine/lang/Language.php index cdcd02905..277464148 100644 --- a/src/pocketmine/lang/Language.php +++ b/src/pocketmine/lang/Language.php @@ -35,7 +35,7 @@ class Language{ */ public static function getLanguageList(string $path = "") : array{ if($path === ""){ - $path = \pocketmine\PATH . "src/pocketmine/lang/locale/"; + $path = \pocketmine\RESOURCE_PATH . "locale/"; } if(is_dir($path)){ @@ -82,7 +82,7 @@ class Language{ $this->langName = strtolower($lang); if($path === null){ - $path = \pocketmine\PATH . "src/pocketmine/lang/locale/"; + $path = \pocketmine\RESOURCE_PATH . "locale/"; } $this->lang = self::loadLang($path, $this->langName);