*
* @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 - 2012 Core Developer Team
* @license GNU GPL 3.0 or any newer version
* @link http://www.ship-simu.org
*
/**
* 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
protected function __construct () {
// Call parent constructor
parent::__construct(__CLASS__);
-
- // Clean up a little
- $this->removeNumberFormaters();
- $this->removeSystemArray();
}
/**
* @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();
$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;
/**
* 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;
}
/**