summaryrefslogtreecommitdiff
path: root/src/main.cpp
diff options
context:
space:
mode:
authorPerttu Ahola <celeron55@gmail.com>2011-08-05 11:22:13 +0300
committerPerttu Ahola <celeron55@gmail.com>2011-08-05 11:22:13 +0300
commit64a6da3e45838a6f764777728736dfa0f6678778 (patch)
tree570cfe68e9036f77ef10f6ca57c3ca489cbb393f /src/main.cpp
parent5f8809e425ba814f102c4387b6bf0cf323bd96c5 (diff)
parentdd9909a574514f59eb527db682a4e8d85350ead9 (diff)
downloadminetest-64a6da3e45838a6f764777728736dfa0f6678778.tar.gz
minetest-64a6da3e45838a6f764777728736dfa0f6678778.tar.bz2
minetest-64a6da3e45838a6f764777728736dfa0f6678778.zip
merged delta and c55
Diffstat (limited to 'src/main.cpp')
-rw-r--r--src/main.cpp8
1 files changed, 2 insertions, 6 deletions
diff --git a/src/main.cpp b/src/main.cpp
index 3193194af..4f57fc078 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -1164,11 +1164,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
@@ -1189,7 +1185,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;