From 07cc29d81929ff6f31faa88d249a8449a99f9a61 Mon Sep 17 00:00:00 2001
From: Alexander Sulfrian <alexander@sulfrian.net>
Date: Sat, 30 Jan 2010 14:01:22 +0100
Subject: added loading for languages and some test for language class

---
 src/base/language.hpp | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

(limited to 'src/base/language.hpp')

diff --git a/src/base/language.hpp b/src/base/language.hpp
index 3c496ab1..b3aff24d 100644
--- a/src/base/language.hpp
+++ b/src/base/language.hpp
@@ -30,6 +30,7 @@
 #include <map>
 #include <string>
 #include <boost/filesystem.hpp>
+#include <log4cxx/logger.h>
 #include "utils/base_exception.hpp"
 
 /**
@@ -53,16 +54,22 @@ namespace usdx
 	class Language
 	{
 	private:
+		static log4cxx::LoggerPtr log;
+
 		boost::filesystem::wpath language_dir;
 
-		std::map<std::wstring, std::wstring>* current_language;
-		std::wstring current_language_name;
+		std::map<std::wstring, std::wstring>* current_translation;
+		std::wstring current_language;
 
-		std::map<std::wstring, std::wstring>* default_language;
+		std::map<std::wstring, std::wstring>* default_translation;
 
 		std::map<std::wstring, std::map<std::wstring, std::wstring>*> translations;
 
+		void parse_translation(const std::wstring& line,
+				       std::map<std::wstring, std::wstring>& map);
+
 		void load_language(const std::wstring& language);
+		void load_default_language(const std::wstring& language);
 
 		Language();
 
@@ -72,7 +79,8 @@ namespace usdx
 
 		static Language* get_instance();
 
-		void init(const boost::filesystem::wpath& language_dir);
+		void init(const boost::filesystem::wpath& language_dir,
+			  const std::wstring& default_language = L"English");
 
 		void set_language(const std::wstring& language);
 		const std::wstring& get_language(void) const;
-- 
cgit v1.2.3