X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fclasses%2Fmain%2Flanguage%2Fclass_LanguageSystem.php;h=f907e6ff409da37f6e3f857dbf77b2cb59f809ee;hb=da516c3d08eed6ecc7e38bb99419971033432e69;hp=4aa9490c2e434b4ef08e2cd5cf74d897931aa799;hpb=b912eda46059527fc0475e043944c3ebff47fbcd;p=shipsimu.git

diff --git a/inc/classes/main/language/class_LanguageSystem.php b/inc/classes/main/language/class_LanguageSystem.php
index 4aa9490..f907e6f 100644
--- a/inc/classes/main/language/class_LanguageSystem.php
+++ b/inc/classes/main/language/class_LanguageSystem.php
@@ -3,7 +3,7 @@
  * The language sub-system for handling language strings being used in the
  * application and whole framework
  *
- * @author		Roland Haeder <webmaster@mxchange.org>
+ * @author		Roland Haeder <webmaster@ship-simu.org>
  * @version		0.0.0
  * @copyright	Copyright(c) 2007, 2008 Roland Haeder, this is free software
  * @license		GNU GPL 3.0 or any newer version
@@ -53,7 +53,7 @@ class LanguageSystem extends BaseFrameworkSystem implements ManageableLanguage {
 		parent::__construct(__CLASS__);
 
 		// Set part description
-		$this->setObjectDescription("Sprachsystem");
+		$this->setObjectDescription("Language sub-system");
 
 		// Create unique ID number
 		$this->createUniqueID();
@@ -66,7 +66,7 @@ class LanguageSystem extends BaseFrameworkSystem implements ManageableLanguage {
 	/**
 	 * Creates an instance of the class LanguageSystem and prepares it for usage
 	 *
-	 * @param		$basePath		The local base path for all language strings
+	 * @param	$basePath		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
@@ -101,7 +101,7 @@ class LanguageSystem extends BaseFrameworkSystem implements ManageableLanguage {
 		$langInstance->initLanguageStrings();
 
 		// Set language code from default config
-		$langInstance->setLanguageCode($langInstance->getConfigInstance()->readConfig("default_lang"));
+		$langInstance->setLanguageCode(FrameworkConfiguration::getInstance()->readConfig('default_lang'));
 
 		// Remember this instance
 		self::$thisInstance = $langInstance;
@@ -120,26 +120,37 @@ class LanguageSystem extends BaseFrameworkSystem implements ManageableLanguage {
 	}
 
 	/**
-	 * Initialize the array-object for all later language strings
+	 * Setter for base path
 	 *
+	 * @param		$basePath		The local base path for all templates
 	 * @return	void
 	 */
-	public function initLanguageStrings () {
-		$this->langStrings = new FrameworkArrayObject();
+	protected final function setBasePath ($basePath) {
+		// And set it
+		$this->basePath = (string) $basePath;
 	}
 
 	/**
-	 * Setter for base path
+	 * Setter for language code
 	 *
-	 * @param		$basePath		The local base path for all templates
+	 * @param		$langCode		The language code for the current application
 	 * @return	void
 	 */
-	public final function setBasePath ($basePath) {
+	protected final function setLanguageCode ($langCode) {
 		// Cast it
-		$basePath = (string) $basePath;
+		$langCode = (string) $langCode;
 
-		// And set it
-		$this->basePath = $basePath;
+		// And set it (only 2 chars)
+		$this->langCode = substr($langCode, 0, 2);
+	}
+
+	/**
+	 * Initialize the array-object for all later language strings
+	 *
+	 * @return	void
+	 */
+	public function initLanguageStrings () {
+		$this->langStrings = new FrameworkArrayObject();
 	}
 
 	/**
@@ -152,17 +163,25 @@ class LanguageSystem extends BaseFrameworkSystem implements ManageableLanguage {
 	}
 
 	/**
-	 * Setter for language code
+	 * Get the plain message from the cache variable for the given message id
 	 *
-	 * @param		$langCode		The language code for the current application
-	 * @return	void
+	 * @param	$messageId		The message id we shall find in the cache variable
+	 * @return	$messageText	The plain message text
 	 */
-	public final function setLanguageCode ($langCode) {
-		// Cast it
-		$langCode = (string) $langCode;
+	public function getMessage ($messageId) {
+		// Default is missing message text
+		$messageText = sprintf("!%s!",
+			$messageId
+		);
+
+		// Try to look it up in the cache variable
+		if ($this->langStrings->offsetExists($messageId)) {
+			// Return the message string
+			$messageText = $this->langStrings->offsetGet($messageId);
+		}
 
-		// And set it (only 2 chars)
-		$this->langCode = substr($langCode, 0, 2);
+		// Return the text
+		return $messageText;
 	}
 }