X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fclasses%2Fmain%2Flanguage%2Fclass_LanguageSystem.php;h=79951708801f4e20e4e4ca4cafa33bc26f694f03;hb=f2e5c734f1b1397a95d517094152da14b136b5a1;hp=ca189a4c4bafa5c0021f686ff4b491ab48d17e41;hpb=84e2207412d3c6ea9f940a83b2cdd4503509808a;p=core.git

diff --git a/inc/classes/main/language/class_LanguageSystem.php b/inc/classes/main/language/class_LanguageSystem.php
index ca189a4c..79951708 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 - 2013 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
@@ -65,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();
 
@@ -91,10 +91,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 +103,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 final static function getInstance () {
-		return self::$thisInstance;
+	public static final function getSelfInstance () {
+		return self::$selfInstance;
 	}
 
 	/**