X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fclasses%2Fmain%2Flanguage%2Fclass_LanguageSystem.php;h=ec094c9eef6ca37bc2438fd481fa759cc006183e;hb=32702da3e7035c52f9124720310b797e05fd7410;hp=ec8b81913830392adb626da967083f6dee1a3c83;hpb=a3fa89c7cbc54491fc74f13db0927d14acf550c8;p=core.git

diff --git a/inc/classes/main/language/class_LanguageSystem.php b/inc/classes/main/language/class_LanguageSystem.php
index ec8b8191..ec094c9e 100644
--- a/inc/classes/main/language/class_LanguageSystem.php
+++ b/inc/classes/main/language/class_LanguageSystem.php
@@ -3,11 +3,11 @@
  * The language sub-system for handling language strings being used in the
  * application and whole framework
  *
- * @author		Roland Haeder <webmaster@ship-simu.org>
+ * @author		Roland Haeder <webmaster@shipsimu.org>
  * @version		0.0.0
- * @copyright	Copyright (c) 2007, 2008 Roland Haeder, 2009, 2010 Core Developer Team
+ * @copyright	Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2015 Core Developer Team
  * @license		GNU GPL 3.0 or any newer version
- * @link		http://www.ship-simu.org
+ * @link		http://www.shipsimu.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -36,12 +36,12 @@ class LanguageSystem extends BaseFrameworkSystem implements ManageableLanguage,
 	/**
 	 * The array-object for all language strings
 	 */
-	private $langStrings = null;
+	private $langStrings = NULL;
 
 	/**
 	 * An instance of this class
 	 */
-	private static $thisInstance = null;
+	private static $selfInstance = NULL;
 
 	/**
 	 * Protected constructor
@@ -56,7 +56,7 @@ class LanguageSystem extends BaseFrameworkSystem implements ManageableLanguage,
 	/**
 	 * Creates an instance of the class LanguageSystem and prepares it for usage
 	 *
-	 * @param	$languageBasePath	The local base path for all language strings
+	 * @param	$languageBasePath	The local base path for all language strings or emty for auto-detection
 	 * @return	$langInstance	An instance of LanguageSystem
 	 * @throws	LanguagePathIsEmptyException	If the provided $languageBasePath is empty
 	 * @throws	InvalidLanguagePathStringException	If $languageBasePath is no string
@@ -65,10 +65,23 @@ class LanguageSystem extends BaseFrameworkSystem implements ManageableLanguage,
 	 * @throws	LanguagePathReadProtectedException	If $languageBasePath is
 	 *										read-protected
 	 */
-	public static final function createLanguageSystem ($languageBasePath) {
+	public static final function createLanguageSystem ($languageBasePath = '') {
 		// Get a new instance
 		$langInstance = new LanguageSystem();
 
+		// Is the base path set?
+		if (empty($languageBasePath)) {
+			// No, then attempt "auto-dection":
+			// 1) Get application
+			$applicationInstance = Registry::getRegistry()->getInstance('app');
+
+			// 2) Try to build it
+			$languageBasePath = sprintf('%sapplication/%s/language/',
+				$langInstance->getConfigInstance()->getConfigEntry('base_path'),
+				$applicationInstance->getAppShortName()
+			);
+		} // END - if
+
 		// Is the base path valid?
 		if (empty($languageBasePath)) {
 			// Language path is empty
@@ -91,10 +104,10 @@ class LanguageSystem extends BaseFrameworkSystem implements ManageableLanguage,
 		$langInstance->initLanguageStrings();
 
 		// Set language code from default config
-		$langInstance->setLanguageCode(FrameworkConfiguration::getInstance()->getConfigEntry('default_lang'));
+		$langInstance->setLanguageCode(FrameworkConfiguration::getSelfInstance()->getConfigEntry('default_lang'));
 
 		// Remember this instance
-		self::$thisInstance = $langInstance;
+		self::$selfInstance = $langInstance;
 
 		// Return the prepared instance
 		return $langInstance;
@@ -103,10 +116,10 @@ class LanguageSystem extends BaseFrameworkSystem implements ManageableLanguage,
 	/**
 	 * Singleton getter for this instance
 	 *
-	 * @return	$thisInstance	An instance of this class
+	 * @return	$selfInstance	An instance of this class
 	 */
-	public static final function getInstance () {
-		return self::$thisInstance;
+	public static final function getSelfInstance () {
+		return self::$selfInstance;
 	}
 
 	/**
@@ -140,7 +153,7 @@ class LanguageSystem extends BaseFrameworkSystem implements ManageableLanguage,
 	 * @return	void
 	 */
 	public function initLanguageStrings () {
-		$this->langStrings = new FrameworkArrayObject("FakedLanguageStrings");
+		$this->langStrings = new FrameworkArrayObject('FakedLanguageStrings');
 	}
 
 	/**
@@ -160,7 +173,7 @@ class LanguageSystem extends BaseFrameworkSystem implements ManageableLanguage,
 	 */
 	public function getMessage ($messageId) {
 		// Default is missing message text
-		$messageText = sprintf("!%s!",
+		$messageText = sprintf('!%s!',
 			$messageId
 		);
 
@@ -168,7 +181,7 @@ class LanguageSystem extends BaseFrameworkSystem implements ManageableLanguage,
 		if ($this->langStrings->offsetExists($messageId)) {
 			// Return the message string
 			$messageText = $this->langStrings->offsetGet($messageId);
-		}
+		} // END - if
 
 		// Return the text
 		return $messageText;