X-Git-Url: https://git.mxchange.org/?p=core.git;a=blobdiff_plain;f=inc%2Fclasses%2Fmain%2Flanguage%2Fclass_LanguageSystem.php;h=3cde53082b6dd0c129efdb0debd6c4d2797658a5;hp=30e97786dc686a6f9ac75e123104bae1353ee391;hb=768cc231b262ebeaa5aec373d9b7d97cc6b6ac95;hpb=b9c18d6c24e3be4393bf41005aa4e428a0ea3218

diff --git a/inc/classes/main/language/class_LanguageSystem.php b/inc/classes/main/language/class_LanguageSystem.php
index 30e97786..3cde5308 100644
--- a/inc/classes/main/language/class_LanguageSystem.php
+++ b/inc/classes/main/language/class_LanguageSystem.php
@@ -5,7 +5,7 @@
  *
  * @author		Roland Haeder <webmaster@ship-simu.org>
  * @version		0.0.0
- * @copyright	Copyright (c) 2007, 2008 Roland Haeder, 2009 Core Developer Team
+ * @copyright	Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2011 Core Developer Team
  * @license		GNU GPL 3.0 or any newer version
  * @link		http://www.ship-simu.org
  *
@@ -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 $thisInstance = NULL;
 
 	/**
 	 * Protected constructor
@@ -51,10 +51,6 @@ class LanguageSystem extends BaseFrameworkSystem implements ManageableLanguage,
 	protected function __construct () {
 		// Call parent constructor
 		parent::__construct(__CLASS__);
-
-		// Clean up a little
-		$this->removeNumberFormaters();
-		$this->removeSystemArray();
 	}
 
 	/**
@@ -69,7 +65,7 @@ class LanguageSystem extends BaseFrameworkSystem implements ManageableLanguage,
 	 * @throws	LanguagePathReadProtectedException	If $languageBasePath is
 	 *										read-protected
 	 */
-	public final static function createLanguageSystem ($languageBasePath) {
+	public static final function createLanguageSystem ($languageBasePath) {
 		// Get a new instance
 		$langInstance = new LanguageSystem();
 
@@ -95,7 +91,7 @@ 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;
@@ -109,7 +105,7 @@ class LanguageSystem extends BaseFrameworkSystem implements ManageableLanguage,
 	 *
 	 * @return	$thisInstance	An instance of this class
 	 */
-	public final static function getInstance () {
+	public static final function getSelfInstance () {
 		return self::$thisInstance;
 	}