summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNils Dagsson Moskopp <nils@dieweltistgarnichtso.net>2011-07-20 09:56:23 -0700
committerNils Dagsson Moskopp <nils@dieweltistgarnichtso.net>2011-07-20 09:56:23 -0700
commit360a8918ddc5b1057b9f520b9f53d38491661bbe (patch)
treeac8c3a7fc7ec7444b341728b209bfe7ea2e2c36f
parent4f53619a15cd5a1cd18e8e3eb7c5eb21608b460e (diff)
parent4d43a674190767cd85288b48737f97e94854e6f4 (diff)
downloadminetest-360a8918ddc5b1057b9f520b9f53d38491661bbe.tar.gz
minetest-360a8918ddc5b1057b9f520b9f53d38491661bbe.tar.bz2
minetest-360a8918ddc5b1057b9f520b9f53d38491661bbe.zip
Merge pull request #24 from SpeedProg/master
gettext paths problem
-rw-r--r--src/main.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/main.cpp b/src/main.cpp
index 7d0ea12ab..b6a53566e 100644
--- 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