diff --git a/phpBB/language/en/composer.json b/phpBB/language/en/composer.json index aef3c41be7..95cb24718c 100644 --- a/phpBB/language/en/composer.json +++ b/phpBB/language/en/composer.json @@ -24,8 +24,8 @@ "local-name": "British English", "phpbb-version": "4.0.0-a1-dev", "direction": "ltr", - "user_lang": "en-gb", - "plural_rule": "1", - "recaptcha_lang": "en-GB" + "user-lang": "en-gb", + "plural-rule": "1", + "recaptcha-lang": "en-GB" } } diff --git a/phpBB/phpbb/language/language_file_helper.php b/phpBB/phpbb/language/language_file_helper.php index e6966a3710..a6041eacb6 100644 --- a/phpBB/phpbb/language/language_file_helper.php +++ b/phpBB/phpbb/language/language_file_helper.php @@ -91,7 +91,7 @@ class language_file_helper */ protected function get_language_data_from_json(array $data) : array { - if (!isset($data['extra']['language-iso']) || !isset($data['extra']['english-name']) || !isset($data['extra']['local-name'])) + if (!isset($data['extra']['language-iso']) || !isset($data['extra']['english-name']) || !isset($data['extra']['local-name']) || !isset($data['extra']['direction']) || !isset($data['extra']['user-lang']) || !isset($data['extra']['plural-rule']) || !isset($data['extra']['recaptcha-lang'])) { throw new DomainException('INVALID_LANGUAGE_PACK'); } @@ -115,6 +115,10 @@ class language_file_helper 'author' => implode(', ', $authors), 'version' => $data['version'], 'phpbb_version' => $data['extra']['phpbb-version'], + 'direction' => $data['extra']['direction'], + 'user-lang' => $data['extra']['user-lang'], + 'plural-rule' => $data['extra']['plural-rule'], + 'recaptcha-lang'=> $data['extra']['recaptcha-lang'], ]; } }