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

Timestamp:

Feb 28, 2009, 7:46:37 PM (16 years ago)

Author:

rgrieder

Message:

Merged buildsystem3 containing buildsystem2 containing Adi's buildsystem branch back to the trunk.
Please update the media directory if you were not using buildsystem3 before.

Location:

code/trunk

Files:

• . (modified) (2 props)
• src/core/Language.cc (modified) (4 diffs)

code/trunk/src/core/Language.cc

@@ -35 +35 @@
 
 #include <fstream>
+#include <boost/filesystem.hpp>
 
 #include "Core.h"
@@ -205 +206 @@
         COUT(4) << "Read default language file." << std::endl;
 
+        boost::filesystem::path filepath(Core::getConfigPath() / getFilename(this->defaultLanguage_));
+
         // This creates the file if it's not existing
         std::ofstream createFile;
-        createFile.open(getFilename(this->defaultLanguage_).c_str(), std::fstream::app);
+        createFile.open(filepath.file_string().c_str(), std::fstream::app);
         createFile.close();
 
         // Open the file
         std::ifstream file;
-        file.open(getFilename(this->defaultLanguage_).c_str(), std::fstream::in);
+        file.open(filepath.file_string().c_str(), std::fstream::in);
 
         if (!file.is_open())
@@ -254 +257 @@
         COUT(4) << "Read translated language file (" << Core::getLanguage() << ")." << std::endl;
 
+        boost::filesystem::path filepath(Core::getConfigPath() / getFilename(Core::getLanguage()));
+
         // Open the file
         std::ifstream file;
-        file.open(getFilename(Core::getLanguage()).c_str(), std::fstream::in);
+        file.open(filepath.file_string().c_str(), std::fstream::in);
 
         if (!file.is_open())
@@ -308 +313 @@
         COUT(4) << "Language: Write default language file." << std::endl;
 
+        boost::filesystem::path filepath(Core::getConfigPath() / getFilename(this->defaultLanguage_));
+
         // Open the file
         std::ofstream file;
-        file.open(getFilename(this->defaultLanguage_).c_str(), std::fstream::out);
+        file.open(filepath.file_string().c_str(), std::fstream::out);
 
         if (!file.is_open())