Changeset 10480 for code/branches/core7/src/libraries/core/CoreConfig.cc

Timestamp:

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

Author:

landauf

Message:

removed dependency of Language on CoreConfig.

File:

• code/branches/core7/src/libraries/core/CoreConfig.cc (modified) (3 diffs)

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_);
     }