diff options
| author | Nils Dagsson Moskopp <nils@dieweltistgarnichtso.net> | 2011-07-20 18:56:32 +0200 |
|---|---|---|
| committer | Nils Dagsson Moskopp <nils@dieweltistgarnichtso.net> | 2011-07-20 18:56:32 +0200 |
| commit | 8ed83250d7253324426b3b5528da17948c935136 (patch) | |
| tree | 80c9b351707cb243bfeba08a8b3f290ea4025fa7 | |
| parent | 33e80dae7f48eac99d5c692d7429e37b11666c96 (diff) | |
| parent | 360a8918ddc5b1057b9f520b9f53d38491661bbe (diff) | |
| download | minetest-8ed83250d7253324426b3b5528da17948c935136.tar.gz minetest-8ed83250d7253324426b3b5528da17948c935136.tar.bz2 minetest-8ed83250d7253324426b3b5528da17948c935136.zip | |
Merge branch 'master' of github.com:erlehmann/minetest-delta
| -rw-r--r-- | src/main.cpp | 8 |
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
|