diff --git a/composer.json b/composer.json index 0aa6ec91e..ed5989141 100644 --- a/composer.json +++ b/composer.json @@ -41,7 +41,7 @@ "pocketmine/classloader": "^0.2.0", "pocketmine/color": "^0.2.0", "pocketmine/errorhandler": "^0.6.0", - "pocketmine/locale-data": "~2.7.0", + "pocketmine/locale-data": "~2.8.0", "pocketmine/log": "^0.4.0", "pocketmine/log-pthreads": "^0.4.0", "pocketmine/math": "^0.4.0", diff --git a/composer.lock b/composer.lock index b3a1fab4d..e0e3a413f 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "d6e210ffd1d4dbe1ed2c18f7c4abf385", + "content-hash": "9f5181578edb8f8424435a213ea2535e", "packages": [ { "name": "adhocore/json-comment", @@ -536,16 +536,16 @@ }, { "name": "pocketmine/locale-data", - "version": "2.7.0", + "version": "2.8.3", "source": { "type": "git", "url": "https://github.com/pmmp/Language.git", - "reference": "f00216c4709d2c5a2af478498315206b336b8e2e" + "reference": "113c115a3b8976917eb22b74dccab464831b6483" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/pmmp/Language/zipball/f00216c4709d2c5a2af478498315206b336b8e2e", - "reference": "f00216c4709d2c5a2af478498315206b336b8e2e", + "url": "https://api.github.com/repos/pmmp/Language/zipball/113c115a3b8976917eb22b74dccab464831b6483", + "reference": "113c115a3b8976917eb22b74dccab464831b6483", "shasum": "" }, "type": "library", @@ -553,9 +553,9 @@ "description": "Language resources used by PocketMine-MP", "support": { "issues": "https://github.com/pmmp/Language/issues", - "source": "https://github.com/pmmp/Language/tree/2.7.0" + "source": "https://github.com/pmmp/Language/tree/2.8.3" }, - "time": "2022-05-10T13:29:27+00:00" + "time": "2022-05-11T13:51:37+00:00" }, { "name": "pocketmine/log", diff --git a/src/Server.php b/src/Server.php index f1643336b..e7cca7fea 100644 --- a/src/Server.php +++ b/src/Server.php @@ -1444,7 +1444,7 @@ class Server{ } if($this->isRunning){ - $this->logger->emergency("Forcing server shutdown"); + $this->logger->emergency($this->language->translate(KnownTranslationFactory::pocketmine_server_forcingShutdown())); } try{ if(!$this->isRunning()){ diff --git a/src/lang/KnownTranslationFactory.php b/src/lang/KnownTranslationFactory.php index 6458215ba..c780371ef 100644 --- a/src/lang/KnownTranslationFactory.php +++ b/src/lang/KnownTranslationFactory.php @@ -1860,6 +1860,14 @@ final class KnownTranslationFactory{ return new Translatable(KnownTranslationKeys::POCKETMINE_PLUGIN_RESTRICTEDNAME, []); } + public static function pocketmine_plugin_someEnableErrors() : Translatable{ + return new Translatable(KnownTranslationKeys::POCKETMINE_PLUGIN_SOMEENABLEERRORS, []); + } + + public static function pocketmine_plugin_someLoadErrors() : Translatable{ + return new Translatable(KnownTranslationKeys::POCKETMINE_PLUGIN_SOMELOADERRORS, []); + } + public static function pocketmine_plugin_spacesDiscouraged(Translatable|string $param0) : Translatable{ return new Translatable(KnownTranslationKeys::POCKETMINE_PLUGIN_SPACESDISCOURAGED, [ 0 => $param0, @@ -1958,6 +1966,10 @@ final class KnownTranslationFactory{ ]); } + public static function pocketmine_server_forcingShutdown() : Translatable{ + return new Translatable(KnownTranslationKeys::POCKETMINE_SERVER_FORCINGSHUTDOWN, []); + } + public static function pocketmine_server_info(Translatable|string $param0, Translatable|string $param1) : Translatable{ return new Translatable(KnownTranslationKeys::POCKETMINE_SERVER_INFO, [ 0 => $param0, diff --git a/src/lang/KnownTranslationKeys.php b/src/lang/KnownTranslationKeys.php index 9201f4b6f..daa20a17f 100644 --- a/src/lang/KnownTranslationKeys.php +++ b/src/lang/KnownTranslationKeys.php @@ -385,6 +385,8 @@ final class KnownTranslationKeys{ public const POCKETMINE_PLUGIN_MAINCLASSNOTFOUND = "pocketmine.plugin.mainClassNotFound"; public const POCKETMINE_PLUGIN_MAINCLASSWRONGTYPE = "pocketmine.plugin.mainClassWrongType"; public const POCKETMINE_PLUGIN_RESTRICTEDNAME = "pocketmine.plugin.restrictedName"; + public const POCKETMINE_PLUGIN_SOMEENABLEERRORS = "pocketmine.plugin.someEnableErrors"; + public const POCKETMINE_PLUGIN_SOMELOADERRORS = "pocketmine.plugin.someLoadErrors"; public const POCKETMINE_PLUGIN_SPACESDISCOURAGED = "pocketmine.plugin.spacesDiscouraged"; public const POCKETMINE_PLUGIN_SUICIDE = "pocketmine.plugin.suicide"; public const POCKETMINE_PLUGIN_UNKNOWNDEPENDENCY = "pocketmine.plugin.unknownDependency"; @@ -405,6 +407,7 @@ final class KnownTranslationKeys{ public const POCKETMINE_SERVER_DEVBUILD_WARNING2 = "pocketmine.server.devBuild.warning2"; public const POCKETMINE_SERVER_DEVBUILD_WARNING3 = "pocketmine.server.devBuild.warning3"; public const POCKETMINE_SERVER_DONATE = "pocketmine.server.donate"; + public const POCKETMINE_SERVER_FORCINGSHUTDOWN = "pocketmine.server.forcingShutdown"; public const POCKETMINE_SERVER_INFO = "pocketmine.server.info"; public const POCKETMINE_SERVER_INFO_EXTENDED = "pocketmine.server.info.extended"; public const POCKETMINE_SERVER_LICENSE = "pocketmine.server.license";