Merge pull request #24 from SpeedProg/master

gettext paths problem
2011-07-20 09:56:23 -07:00 · 2011-07-20 09:56:23 -07:00 · 0f10fc0cd9
parent af4b532c9e c6d99fbe0c
commit 0f10fc0cd9
1 changed files with 4 additions and 4 deletions
--- a/src/main.cpp
+++ b/src/main.cpp
@ -1060,10 +1060,6 @@ int main(int argc, char *argv[])
 	std::locale::global(std::locale("C"));
 	// This enables printing all characters in bitmap font
 	setlocale(LC_CTYPE, "en_US");
-	setlocale(LC_ALL, "");
-	bindtextdomain("minetest-c55", "./../locale");
-	textdomain("minetest-c55");
-
 	/*
 		Parse command line
 	*/
@ -1135,6 +1131,10 @@ int main(int argc, char *argv[])

 	// Create user data directory
 	fs::CreateDir(porting::path_userdata);
+
+	setlocale(LC_ALL, "");
+	bindtextdomain("minetest-c55", (porting::path_userdata+"/locale").c_str());
+	textdomain("minetest-c55");
 	
 	// Initialize debug streams
 #ifdef RUN_IN_PLACE