1 files changed, 63 insertions, 52 deletions
diff --git a/phpBB/phpbb/extension/metadata_manager.php b/phpBB/phpbb/extension/metadata_manager.php
index 047f0ca54c..014d8c79c7 100644
--- a/phpBB/phpbb/extension/metadata_manager.php
+++ b/phpBB/phpbb/extension/metadata_manager.php
@@ -37,6 +37,12 @@ class metadata_manager
 	protected $template;
 
 	/**
+	* phpBB User instance
+	* @var \phpbb\user
+	*/
+	protected $user;
+
+	/**
 	* phpBB root path
 	* @var string
 	*/
@@ -65,15 +71,17 @@ class metadata_manager
 	*
 	* @param string				$ext_name			Name (including vendor) of the extension
 	* @param \phpbb\config\config		$config				phpBB Config instance
-	* @param \phpbb\extension\manager	$extension_manager An instance of the phpBBb extension manager
-	* @param \phpbb\template\template		$template			phpBB Template instance
+	* @param \phpbb\extension\manager	$extension_manager	An instance of the phpBB extension manager
+	* @param \phpbb\template\template	$template			phpBB Template instance
+	* @param \phpbb\user 		$user 				User instance
 	* @param string				$phpbb_root_path	Path to the phpbb includes directory.
 	*/
-	public function __construct($ext_name, \phpbb\config\config $config, \phpbb\extension\manager $extension_manager, \phpbb\template\template $template, $phpbb_root_path)
+	public function __construct($ext_name, \phpbb\config\config $config, \phpbb\extension\manager $extension_manager, \phpbb\template\template $template, \phpbb\user $user, $phpbb_root_path)
 	{
 		$this->config = $config;
 		$this->extension_manager = $extension_manager;
 		$this->template = $template;
+		$this->user = $user;
 		$this->phpbb_root_path = $phpbb_root_path;
 
 		$this->ext_name = $ext_name;
@@ -82,11 +90,11 @@ class metadata_manager
 	}
 
 	/**
-	 * Processes and gets the metadata requested
-	 *
-	 * @param  string $element			All for all metadata that it has and is valid, otherwise specify which section you want by its shorthand term.
-	 * @return array					Contains all of the requested metadata, throws an exception on failure
-	 */
+	* Processes and gets the metadata requested
+	*
+	* @param  string $element			All for all metadata that it has and is valid, otherwise specify which section you want by its shorthand term.
+	* @return array					Contains all of the requested metadata, throws an exception on failure
+	*/
 	public function get_metadata($element = 'all')
 	{
 		$this->set_metadata_file();
@@ -128,10 +136,10 @@ class metadata_manager
 	}
 
 	/**
-	 * Sets the filepath of the metadata file
-	 *
-	 * @return boolean  Set to true if it exists, throws an exception on failure
-	 */
+	* Sets the filepath of the metadata file
+	*
+	* @throws \phpbb\extension\exception
+	*/
 	private function set_metadata_file()
 	{
 		$ext_filepath = $this->extension_manager->get_extension_path($this->ext_name);
@@ -141,31 +149,32 @@ class metadata_manager
 
 		if (!file_exists($this->metadata_file))
 		{
-			throw new \phpbb\extension\exception('The required file does not exist: ' . $this->metadata_file);
+			throw new \phpbb\extension\exception($this->user->lang('FILE_NOT_FOUND', $this->metadata_file));
 		}
 	}
 
 	/**
-	 * Gets the contents of the composer.json file
-	 *
-	 * @return bool True if success, throws an exception on failure
-	 */
+	* Gets the contents of the composer.json file
+	*
+	* @return bool True if success, throws an exception on failure
+	* @throws \phpbb\extension\exception
+	*/
 	private function fetch_metadata()
 	{
 		if (!file_exists($this->metadata_file))
 		{
-			throw new \phpbb\extension\exception('The required file does not exist: ' . $this->metadata_file);
+			throw new \phpbb\extension\exception($this->user->lang('FILE_NOT_FOUND', $this->metadata_file));
 		}
 		else
 		{
 			if (!($file_contents = file_get_contents($this->metadata_file)))
 			{
-				throw new \phpbb\extension\exception('file_get_contents failed on ' . $this->metadata_file);
+				throw new \phpbb\extension\exception($this->user->lang('FILE_CONTENT_ERR', $this->metadata_file));
 			}
 
 			if (($metadata = json_decode($file_contents, true)) === null)
 			{
-				throw new \phpbb\extension\exception('json_decode failed on ' . $this->metadata_file);
+				throw new \phpbb\extension\exception($this->user->lang('FILE_JSON_DECODE_ERR', $this->metadata_file));
 			}
 
 			$this->metadata = $metadata;
@@ -175,10 +184,10 @@ class metadata_manager
 	}
 
 	/**
-	 * This array handles the cleaning of the array
-	 *
-	 * @return array Contains the cleaned metadata array
-	 */
+	* This array handles the cleaning of the array
+	*
+	* @return array Contains the cleaned metadata array
+	*/
 	private function clean_metadata_array()
 	{
 		return $this->metadata;
@@ -191,6 +200,7 @@ class metadata_manager
 	* 						"display" for name, type, and authors
 	* 						"name", "type")
 	* @return Bool True if valid, throws an exception if invalid
+	* @throws \phpbb\extension\exception
 	*/
 	public function validate($name = 'display')
 	{
@@ -224,12 +234,12 @@ class metadata_manager
 				{
 					if (!isset($this->metadata[$name]))
 					{
-						throw new \phpbb\extension\exception("Required meta field '$name' has not been set.");
+						throw new \phpbb\extension\exception($this->user->lang('META_FIELD_NOT_SET', $name));
 					}
 
 					if (!preg_match($fields[$name], $this->metadata[$name]))
 					{
-						throw new \phpbb\extension\exception("Meta field '$name' is invalid.");
+						throw new \phpbb\extension\exception($this->user->lang('META_FIELD_INVALID', $name));
 					}
 				}
 			break;
@@ -239,22 +249,23 @@ class metadata_manager
 	}
 
 	/**
-	 * Validates the contents of the authors field
-	 *
-	 * @return boolean True when passes validation, throws exception if invalid
-	 */
+	* Validates the contents of the authors field
+	*
+	* @return boolean True when passes validation, throws exception if invalid
+	* @throws \phpbb\extension\exception
+	*/
 	public function validate_authors()
 	{
 		if (empty($this->metadata['authors']))
 		{
-			throw new \phpbb\extension\exception("Required meta field 'authors' has not been set.");
+			throw new \phpbb\extension\exception($this->user->lang('META_FIELD_NOT_SET', 'authors'));
 		}
 
 		foreach ($this->metadata['authors'] as $author)
 		{
 			if (!isset($author['name']))
 			{
-				throw new \phpbb\extension\exception("Required meta field 'author name' has not been set.");
+				throw new \phpbb\extension\exception($this->user->lang('META_FIELD_NOT_SET', 'author name'));
 			}
 		}
 
@@ -262,10 +273,10 @@ class metadata_manager
 	}
 
 	/**
-	 * This array handles the verification that this extension can be enabled on this board
-	 *
-	 * @return bool True if validation succeeded, False if failed
-	 */
+	* This array handles the verification that this extension can be enabled on this board
+	*
+	* @return bool True if validation succeeded, False if failed
+	*/
 	public function validate_enable()
 	{
 		// Check for valid directory & phpBB, PHP versions
@@ -278,10 +289,10 @@ class metadata_manager
 	}
 
 	/**
-	 * Validates the most basic directory structure to ensure it follows <vendor>/<ext> convention.
-	 *
-	 * @return boolean True when passes validation
-	 */
+	* Validates the most basic directory structure to ensure it follows <vendor>/<ext> convention.
+	*
+	* @return boolean True when passes validation
+	*/
 	public function validate_dir()
 	{
 		return (substr_count($this->ext_name, '/') === 1 && $this->ext_name == $this->get_metadata('name'));
@@ -289,10 +300,10 @@ class metadata_manager
 
 
 	/**
-	 * Validates the contents of the phpbb requirement field
-	 *
-	 * @return boolean True when passes validation
-	 */
+	* Validates the contents of the phpbb requirement field
+	*
+	* @return boolean True when passes validation
+	*/
 	public function validate_require_phpbb()
 	{
 		if (!isset($this->metadata['require']['phpbb/phpbb']))
@@ -304,10 +315,10 @@ class metadata_manager
 	}
 
 	/**
-	 * Validates the contents of the php requirement field
-	 *
-	 * @return boolean True when passes validation
-	 */
+	* Validates the contents of the php requirement field
+	*
+	* @return boolean True when passes validation
+	*/
 	public function validate_require_php()
 	{
 		if (!isset($this->metadata['require']['php']))
@@ -340,10 +351,10 @@ class metadata_manager
 	}
 
 	/**
-	 * Outputs the metadata into the template
-	 *
-	 * @return null
-	 */
+	* Outputs the metadata into the template
+	*
+	* @return null
+	*/
 	public function output_template_data()
 	{
 		$this->template->assign_vars(array(