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 | 2732dac337229297cc15941f2ca625a33fbcfef4 (patch) | |
| tree | 7dd3adecff24f73a5fe60f82431710192dce01c7 /src | |
| parent | 84b85964fac715d03fef7094d2cdcd5945cb0dd2 (diff) | |
| parent | 0f10fc0cd960009eb3df298c18d7562494ded7b4 (diff) | |
| download | minetest-2732dac337229297cc15941f2ca625a33fbcfef4.tar.gz minetest-2732dac337229297cc15941f2ca625a33fbcfef4.tar.bz2 minetest-2732dac337229297cc15941f2ca625a33fbcfef4.zip | |
Merge branch 'master' of github.com:erlehmann/minetest-delta
Diffstat (limited to 'src')
| -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
|