X-Git-Url: https://git.lizzy.rs/?a=blobdiff_plain;f=src%2Fmain.cpp;h=df0a7ff3121acfe3bf5541662334af7b21145b37;hb=96bee29e35f0790657fbd8bb67d2af79b498255c;hp=9a9b22f87fa54e840f8caa03b39a8400083bcd42;hpb=df27b854325c1fe96b7bc9f8a1cc227b55896f57;p=dragonfireclient.git

diff --git a/src/main.cpp b/src/main.cpp
index 9a9b22f87..df0a7ff31 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -1161,11 +1161,7 @@ int main(int argc, char *argv[])
 	// Create user data directory
 	fs::CreateDir(porting::path_userdata);
 
-#ifdef USE_GETTEXT
-	setlocale(LC_MESSAGES, "");
-	bindtextdomain("minetest", (porting::path_userdata+"/locale").c_str());
-	textdomain("minetest");
-#endif
+	init_gettext((porting::path_data+"/../locale").c_str());
 	
 	// Initialize debug streams
 #ifdef RUN_IN_PLACE
@@ -1186,7 +1182,7 @@ int main(int argc, char *argv[])
 	BEGIN_DEBUG_EXCEPTION_HANDLER
 
 	// Print startup message
-	dstream<<DTIME<<"minetest-c55"
+	dstream<<DTIME<<PROJECT_NAME
 			" with SER_FMT_VER_HIGHEST="<<(int)SER_FMT_VER_HIGHEST
 			<<", "<<BUILD_INFO
 			<<std::endl;
@@ -1302,7 +1298,7 @@ int main(int argc, char *argv[])
 		g_timegetter = new SimpleTimeGetter();
 		
 		// Create server
-		Server server(map_dir.c_str());
+		Server server(map_dir.c_str(), configpath);
 		server.start(port);
 		
 		// Run server
@@ -1641,7 +1637,8 @@ int main(int argc, char *argv[])
 				password,
 				address,
 				port,
-				error_message
+				error_message,
+				configpath
 			);
 
 		} //try