X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fclasses%2Fmain%2Flanguage%2Fclass_LanguageSystem.php;h=e6bfa77f5fcd8696070c804b2018e378b918dae3;hb=38712c68b26646fb182dd5c0fb46befcf4ee91b9;hp=befccdb1414a132c9a7dbc30dc3a8efef6617cb6;hpb=c6d73b0e3246efc824cb98338d4be7ee5bc9f308;p=core.git

diff --git a/inc/classes/main/language/class_LanguageSystem.php b/inc/classes/main/language/class_LanguageSystem.php
index befccdb1..e6bfa77f 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, this is free software
+ * @copyright	Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2014 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
@@ -22,26 +22,26 @@
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-class LanguageSystem extends BaseFrameworkSystem implements ManageableLanguage {
+class LanguageSystem extends BaseFrameworkSystem implements ManageableLanguage, Registerable {
 	/**
 	 * The full-qualified base path for the language include files
 	 */
-	private $basePath = "";
+	private $languageBasePath = '';
 
 	/**
 	 * The 2-char language code
 	 */
-	private $langCode = "xx"; // This will later be overwritten!
+	private $langCode = 'xx'; // This will later be overwritten!
 
 	/**
 	 * 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
@@ -51,54 +51,50 @@ class LanguageSystem extends BaseFrameworkSystem implements ManageableLanguage {
 	protected function __construct () {
 		// Call parent constructor
 		parent::__construct(__CLASS__);
-
-		// Clean up a little
-		$this->removeNumberFormaters();
-		$this->removeSystemArray();
 	}
 
 	/**
 	 * Creates an instance of the class LanguageSystem and prepares it for usage
 	 *
-	 * @param	$basePath		The local base path for all language strings
+	 * @param	$languageBasePath	The local base path for all language strings
 	 * @return	$langInstance	An instance of LanguageSystem
-	 * @throws	LanguagePathIsEmptyException		If the provided $basePath is empty
-	 * @throws	InvalidLanguagePathStringException	If $basePath is no string
-	 * @throws	LanguagePathIsNoDirectoryException	If $basePath is no
+	 * @throws	LanguagePathIsEmptyException	If the provided $languageBasePath is empty
+	 * @throws	InvalidLanguagePathStringException	If $languageBasePath is no string
+	 * @throws	LanguagePathIsNoDirectoryException	If $languageBasePath is no
 	 *										directory or not found
-	 * @throws	LanguagePathReadProtectedException	If $basePath is
+	 * @throws	LanguagePathReadProtectedException	If $languageBasePath is
 	 *										read-protected
 	 */
-	public final static function createLanguageSystem ($basePath) {
+	public static final function createLanguageSystem ($languageBasePath) {
 		// Get a new instance
 		$langInstance = new LanguageSystem();
 
 		// Is the base path valid?
-		if (empty($basePath)) {
+		if (empty($languageBasePath)) {
 			// Language path is empty
 			throw new LanguagePathIsEmptyException($langInstance, self::EXCEPTION_UNEXPECTED_EMPTY_STRING);
-		} elseif (!is_string($basePath)) {
+		} elseif (!is_string($languageBasePath)) {
 			// Is not a string
-			throw new InvalidLanguagePathStringException(array($langInstance, $basePath), self::EXCEPTION_INVALID_STRING);
-		} elseif (!is_dir($basePath)) {
+			throw new InvalidLanguagePathStringException(array($langInstance, $languageBasePath), self::EXCEPTION_INVALID_STRING);
+		} elseif (!is_dir($languageBasePath)) {
 			// Is not a path
-			throw new LanguagePathIsNoDirectoryException(array($langInstance, $basePath), self::EXCEPTION_INVALID_PATH_NAME);
-		} elseif (!is_readable($basePath)) {
+			throw new LanguagePathIsNoDirectoryException(array($langInstance, $languageBasePath), self::EXCEPTION_INVALID_PATH_NAME);
+		} elseif (!is_readable($languageBasePath)) {
 			// Is not readable
-			throw new LanguagePathReadProtectedException(array($langInstance, $basePath), self::EXCEPTION_READ_PROTECED_PATH);
+			throw new LanguagePathReadProtectedException(array($langInstance, $languageBasePath), self::EXCEPTION_READ_PROTECED_PATH);
 		}
 
 		// Set the base path
-		$langInstance->setBasePath($basePath);
+		$langInstance->setLanguageBasePath($languageBasePath);
 
 		// Initialize the variable stack
 		$langInstance->initLanguageStrings();
 
 		// Set language code from default config
-		$langInstance->setLanguageCode(FrameworkConfiguration::getInstance()->readConfig('default_lang'));
+		$langInstance->setLanguageCode(FrameworkConfiguration::getSelfInstance()->getConfigEntry('default_lang'));
 
 		// Remember this instance
-		self::$thisInstance = $langInstance;
+		self::$selfInstance = $langInstance;
 
 		// Return the prepared instance
 		return $langInstance;
@@ -107,27 +103,27 @@ 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 final static function getInstance () {
-		return self::$thisInstance;
+	public static final function getSelfInstance () {
+		return self::$selfInstance;
 	}
 
 	/**
 	 * Setter for base path
 	 *
-	 * @param		$basePath		The local base path for all templates
+	 * @param	$languageBasePath	The relative base path for all language files
 	 * @return	void
 	 */
-	protected final function setBasePath ($basePath) {
+	protected final function setLanguageBasePath ($languageBasePath) {
 		// And set it
-		$this->basePath = (string) $basePath;
+		$this->languageBasePath = (string) $languageBasePath;
 	}
 
 	/**
 	 * Setter for language code
 	 *
-	 * @param		$langCode		The language code for the current application
+	 * @param	$langCode	The language code for the current application
 	 * @return	void
 	 */
 	protected final function setLanguageCode ($langCode) {
@@ -150,7 +146,7 @@ class LanguageSystem extends BaseFrameworkSystem implements ManageableLanguage {
 	/**
 	 * Getter for language code
 	 *
-	 * @return	$langCode		The language code for the current application
+	 * @return	$langCode	The language code for the current application
 	 */
 	public final function getLanguageCode () {
 		return $this->langCode;