Merge branch 'master' of github.com:erlehmann/minetest-delta

This commit is contained in:
Nils Dagsson Moskopp 2011-07-20 18:56:32 +02:00
commit 8ed83250d7
1 changed files with 4 additions and 4 deletions

View File

@ -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