Changeset 1535 for code/trunk/src/core/Language.cc

Timestamp:

Jun 4, 2008, 8:54:43 PM (17 years ago)

Author:

rgrieder

Message:

merged input branch back to trunk

File:

• code/trunk/src/core/Language.cc (modified) (3 diffs)

code/trunk/src/core/Language.cc

@@ -36 +36 @@
 #include <fstream>
 
-#include "CoreSettings.h"
+#include "Core.h"
 
 #include "Debug.h"
@@ -245 +245 @@
     void Language::readTranslatedLanguageFile()
     {
-        COUT(4) << "Read translated language file (" << CoreSettings::getLanguage() << ")." << std::endl;
+        COUT(4) << "Read translated language file (" << Core::getLanguage() << ")." << std::endl;
 
         // Open the file
         std::ifstream file;
-        file.open(getFileName(CoreSettings::getLanguage()).c_str(), std::fstream::in);
+        file.open(getFileName(Core::getLanguage()).c_str(), std::fstream::in);
 
         if (!file.is_open())
         {
             COUT(1) << "An error occurred in Language.cc:" << std::endl;
-            COUT(1) << "Error: Couldn't open file " << getFileName(CoreSettings::getLanguage()) << " to read the translated language entries!" << std::endl;
-            CoreSettings::resetLanguage();
+            COUT(1) << "Error: Couldn't open file " << getFileName(Core::getLanguage()) << " to read the translated language entries!" << std::endl;
+            Core::resetLanguage();
             COUT(3) << "Info: Reset language to " << this->defaultLanguage_ << "." << std::endl;
             return;
@@ -286 +286 @@
                 else
                 {
-                    COUT(2) << "Warning: Invalid language entry \"" << lineString << "\" in " << getFileName(CoreSettings::getLanguage()) << std::endl;
+                    COUT(2) << "Warning: Invalid language entry \"" << lineString << "\" in " << getFileName(Core::getLanguage()) << std::endl;
                 }
             }