fix compile errors, add config values for i18n #13

pvpgn · Jun 24, 2014 · 102e315 · 102e315 · anonbyte · Jun 24, 2014
1 parent d4b513d
commit 102e315
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 11 deletions.
diff --git a/conf/bnetd.conf.in b/conf/bnetd.conf.in
@@ -79,6 +79,7 @@ storage_path = "file:mode=plain;dir=${LOCALSTATEDIR}/users;clan=${LOCALSTATEDIR}
 #----------------------------------------------------------------------------#
 
 filedir     = "${LOCALSTATEDIR}/files"
+i18ndir     = "${SYSCONFDIR}/i18n"
 scriptdir   = "${LOCALSTATEDIR}/lua"
 reportdir   = "${LOCALSTATEDIR}/reports"
 chanlogdir  = "${LOCALSTATEDIR}/chanlogs"

diff --git a/conf/bnetd.conf.win32 b/conf/bnetd.conf.win32
@@ -59,6 +59,7 @@ storage_path = file:mode=plain;dir=var\users;clan=var\clans;team=var\teams;defau
 #----------------------------------------------------------------------------#
 
 filedir     = files
+i18ndir     = conf\i18n
 scriptdir   = lua
 reportdir   = var\reports
 chanlogdir  = var\chanlogs

diff --git a/conf/bnhelp.conf.in b/conf/bnhelp.conf.in
@@ -450,7 +450,7 @@
 --------------------------------------------------------
 /rehash <mode>
 	Forces the server to reload specified config. Set "all" to reload all configs.
-	<mode> = all | channels | realms | autoupdate | news | versioncheck | ipbans | helpfile | banners | tracker | commandgroups | aliasfile | transfile | tournament | icons | anongame | topiclist | lua
+	<mode> = all | i18n | channels | realms | autoupdate | news | versioncheck | ipbans | helpfile | banners | tracker | commandgroups | aliasfile | transfile | tournament | icons | anongame | topiclist | lua
 
 %clan
 --------------------------------------------------------

diff --git a/src/bnetd/i18n.cpp b/src/bnetd/i18n.cpp
@@ -51,8 +51,8 @@
 #include "message.h"
 #include "helpfile.h"
 #include "channel.h"
-#include "i18n.h"
 #include "prefs.h"
+#include "i18n.h"
 #include "common/setup_after.h"
 
 namespace pvpgn
@@ -72,8 +72,10 @@ namespace pvpgn
 			} 
 		*/
 		std::map<std::string, std::map<t_gamelang, std::string> > translations = std::map<std::string, std::map<t_gamelang, std::string> >();
-
-		std::vector<t_gamelang> languages{
+
+		const char * _find_string(char const * text, t_gamelang gamelang);
+
+		const t_gamelang languages[12] = {
 			GAMELANG_ENGLISH_UINT,	/* enUS */
 			GAMELANG_GERMAN_UINT,	/* deDE */
 			GAMELANG_CZECH_UINT,	/* csCZ */
@@ -88,8 +90,6 @@ namespace pvpgn
 			GAMELANG_CHINESE_T_UINT	/* zhTW */
 		};
 
-		const char * _find_string(char const * text, t_gamelang gamelang);
-
 
 		extern int i18n_reload(void)
 		{
@@ -108,9 +108,9 @@ namespace pvpgn
 			std::string original, translate;
 
 			// iterate language list
-			for (std::vector<t_gamelang>::iterator lang = languages.begin(); lang != languages.end(); ++lang)
+			for (int i = 0; i < (sizeof(languages) / sizeof(*languages)); i++)
 			{
-				lang_filename = i18n_filename(filename, *lang);
+				lang_filename = i18n_filename(filename, languages[i]);
 				if (FILE *f = fopen(lang_filename.c_str(), "r")) {
 					fclose(f);
 
@@ -158,10 +158,10 @@ namespace pvpgn
 						if (translate[0] == '\0')
 						{
 							translate = original;
-							WARN2("empty localization for \"%s\", use original string (%s)", original, lang_filename.c_str());
+							WARN2("empty localization for \"%s\", use original string (%s)", original.c_str(), lang_filename.c_str());
 						}
 					}
-					translations[original][*lang] = translate;
+					translations[original][languages[i]] = translate;
 				}
 
 				INFO1("localization file loaded \"%s\"", lang_filename.c_str());

diff --git a/src/bnetd/i18n.h b/src/bnetd/i18n.h
@@ -23,7 +23,6 @@ namespace pvpgn
 	namespace bnetd
 	{
 
-
 	}
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -23,7 +23,6 @@ namespace pvpgn @@
     	namespace bnetd
     	{
     	}
     }
@@ Expand Down @@