aboutsummaryrefslogtreecommitdiff
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
commit0f10fc0cd960009eb3df298c18d7562494ded7b4 (patch)
tree52b027959020a6d8577d2c25d3e66870b9370e0c
parentaf4b532c9e5cec84eb18ec52214636e69c653d87 (diff)
parentc6d99fbe0c42b86585263a2562db671d9c168581 (diff)
downloadminetest-0f10fc0cd960009eb3df298c18d7562494ded7b4.tar.gz
minetest-0f10fc0cd960009eb3df298c18d7562494ded7b4.tar.bz2
minetest-0f10fc0cd960009eb3df298c18d7562494ded7b4.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