Merge branch 'upstream/master'

[dragonfireclient.git] / src / main.cpp

diff --git a/src/main.cpp b/src/main.cpp
index 9a9b22f87fa54e840f8caa03b39a8400083bcd42..df0a7ff3121acfe3bf5541662334af7b21145b37 100644 (file)
--- 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