diff --git a/install/index.php b/install/index.php index 576176c..b506bc0 100644 --- a/install/index.php +++ b/install/index.php @@ -6,7 +6,7 @@ IncludeModuleLangFile(__FILE__); class bx_null extends \CModule { - public $sys = []; + public $module = []; var $MODULE_GROUP_RIGHTS = 'Y'; function __construct() @@ -16,18 +16,18 @@ class bx_null extends \CModule $module = json_decode(file_get_contents(__DIR__.'/../.module.json'), true); } - $this->sys = $module; + $this->module = $module; $this->MODULE_ID = $module['id']; $this->MODULE_VERSION = $module['version']; $this->MODULE_VERSION_DATE = $module['date']; - $langPrefix = strtoupper($module['prefix']); + $langPrefix = $module['prefix']; - $this->PARTNER_NAME = GetMessage("{$langPrefix}_PARTNER_NAME"); - $this->PARTNER_URI = GetMessage("{$langPrefix}_PARTNER_URI"); - $this->MODULE_NAME = GetMessage("{$langPrefix}_MODULE_NAME"); - $this->MODULE_DESCRIPTION = GetMessage("{$langPrefix}_MODULE_DESCRIPTION"); + $this->PARTNER_NAME = GetMessage("{$langPrefix}_partner_name"); + $this->PARTNER_URI = GetMessage("{$langPrefix}_partner_uri"); + $this->MODULE_NAME = GetMessage("{$langPrefix}_module_name"); + $this->MODULE_DESCRIPTION = GetMessage("{$langPrefix}_module_description"); } @@ -35,8 +35,8 @@ class bx_null extends \CModule { global $DOCUMENT_ROOT, $APPLICATION; - if(is_array($this->sys['deps'])){ - foreach ($this->sys['deps'] as $moduleId){ + if(is_array($this->module['deps'])){ + foreach ($this->module['deps'] as $moduleId){ if (!\Bitrix\Main\Loader::includeModule($moduleId)) { $APPLICATION->ThrowException("Module {$moduleId} not installed!"); return false; diff --git a/lang/ru/install/index.php b/lang/ru/install/index.php index 69a014c..8ba883d 100644 --- a/lang/ru/install/index.php +++ b/lang/ru/install/index.php @@ -1,7 +1,5 @@