Changeset 10480 for code/branches/core7

Timestamp:

May 25, 2015, 9:01:33 PM (10 years ago)

Author:

landauf

Message:

removed dependency of Language on CoreConfig.

Location:

code/branches/core7/src/libraries/core

Files:

• Core.cc (modified) (1 diff)
• CoreConfig.cc (modified) (3 diffs)
• CoreConfig.h (modified) (1 diff)
• Language.cc (modified) (5 diffs)
• Language.h (modified) (1 diff)

code/branches/core7/src/libraries/core/Core.cc

@@ -182 +182 @@
         orxout(internal_info) << "configuring Core" << endl;
         this->config_ = new CoreConfig();
-        this->config_->setConfigValues(); // TODO: move this into CoreConfig constructor (but resolve dependency to Language)
 
         // Set the correct log path and rewrite the log file with the correct log levels

code/branches/core7/src/libraries/core/CoreConfig.cc

@@ -47 +47 @@
     {
         RegisterObject(CoreConfig);
+        this->setConfigValues();
     }
 
@@ -114 +115 @@
     {
         // Read the translation file after the language was configured
-        Language::getInstance().readTranslatedLanguageFile();
+        bool success = Language::getInstance().readTranslatedLanguageFile(this->language_);
+        if (!success)
+        {
+            // Set the language in the config-file back to the default.
+            ResetConfigValue(language_);
+            orxout(internal_info, context::language) << "Reset language to " << this->language_ << '.' << endl;
+        }
     }
 
@@ -126 +133 @@
             bInitialized = true;
         }
-    }
-
-    //! Sets the language in the config-file back to the default.
-    void CoreConfig::resetLanguage()
-    {
-        ResetConfigValue(language_);
     }
 

code/branches/core7/src/libraries/core/CoreConfig.h

@@ -47 +47 @@
                 { return this->bDevMode_; }
 
-            //! Returns the configured language.
-            const std::string& getLanguage()
-                { return this->language_; }
-            void resetLanguage();
-
             inline bool getStartIOConsole() const
                 { return this->bStartIOConsole_; }

code/branches/core7/src/libraries/core/Language.cc

@@ -37 +37 @@
 #include "util/Output.h"
 #include "util/StringUtils.h"
-#include "Core.h"
 #include "PathConfig.h"
 
@@ -247 +246 @@
     /**
         @brief Reads the language file of the configured language and assigns the localisation to the corresponding LanguageEntry object.
-    */
-    void Language::readTranslatedLanguageFile()
-    {
-        orxout(internal_info, context::language) << "Read translated language file (" << Core::getInstance().getConfig()->getLanguage() << ")." << endl;
-
-        const std::string& filepath = PathConfig::getConfigPathString() + getFilename(Core::getInstance().getConfig()->getLanguage());
+        @return Returns false if the language file couldn't be found.
+    */
+    bool Language::readTranslatedLanguageFile(const std::string& language)
+    {
+        orxout(internal_info, context::language) << "Read translated language file (" << language << ")." << endl;
+
+        const std::string& filepath = PathConfig::getConfigPathString() + getFilename(language);
 
         // Open the file
@@ -261 +261 @@
         {
             orxout(internal_error, context::language) << "An error occurred in Language.cc:" << endl;
-            orxout(internal_error, context::language) << "Couldn't open file " << getFilename(Core::getInstance().getConfig()->getLanguage()) << " to read the translated language entries!" << endl;
-            Core::getInstance().getConfig()->resetLanguage();
-            orxout(internal_info, context::language) << "Reset language to " << this->defaultLanguage_ << '.' << endl;
-            return;
+            orxout(internal_error, context::language) << "Couldn't open file " << getFilename(language) << " to read the translated language entries!" << endl;
+            return false;
         }
 
@@ -291 +289 @@
                 else
                 {
-                    orxout(internal_warning, context::language) << "Invalid language entry \"" << lineString << "\" in " << getFilename(Core::getInstance().getConfig()->getLanguage()) << endl;
+                    orxout(internal_warning, context::language) << "Invalid language entry \"" << lineString << "\" in " << getFilename(language) << endl;
                 }
             }
@@ -297 +295 @@
 
         file.close();
+        return true;
     }
 

code/branches/core7/src/libraries/core/Language.h

@@ -174 +174 @@
 
             void readDefaultLanguageFile();
-            void readTranslatedLanguageFile();
+            bool readTranslatedLanguageFile(const std::string& language);
             void writeDefaultLanguageFile() const;
             static std::string getFilename(const std::string& language);