From 8628755c076dbd0e5b968fc9028b6f20194e8bdd Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Sat, 8 Nov 2014 07:07:29 +0100
Subject: [PATCH] [ticket/414] Add possibility to specify different vendor for
 module language

B3P-414
---
 controller/helper.php        | 10 +++++++++-
 modules/module_interface.php |  4 +++-
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/controller/helper.php b/controller/helper.php
index d34dcc8d..44671acf 100644
--- a/controller/helper.php
+++ b/controller/helper.php
@@ -191,7 +191,15 @@ class helper
 	{
 		if ($language_file = $module->get_language())
 		{
-			$this->user->add_lang_ext('board3/portal', 'modules/' . $language_file);
+			// Load language file from vendor if specified
+			if (is_array($language_file))
+			{
+				$this->user->add_lang_ext($language_file['vendor'], $language_file['file']);
+			}
+			else
+			{
+				$this->user->add_lang_ext('board3/portal', 'modules/' . $language_file);
+			}
 		}
 	}
 
diff --git a/modules/module_interface.php b/modules/module_interface.php
index 2570443a..ed83f535 100644
--- a/modules/module_interface.php
+++ b/modules/module_interface.php
@@ -47,7 +47,9 @@ interface module_interface
 	* File must be in "board3/portal/language/{$user->lang}/portal/" or
 	* this should return false.
 	*
-	* @return string|bool Language file or false
+	* @return string|bool|array	Language file, array of vendor and language file
+	*		or false. Array has to match this format:
+	*		array('vendor' => 'foo', 'file' => 'bar')
 	*/
 	public function get_language();