1
0
mirror of https://github.com/moparisthebest/minetest synced 2024-12-23 16:08:51 -05:00

Merge pull request #24 from SpeedProg/master

gettext paths problem
This commit is contained in:
Nils Dagsson Moskopp 2011-07-20 09:56:23 -07:00
commit 0f10fc0cd9

View File

@ -1060,10 +1060,6 @@ int main(int argc, char *argv[])
std::locale::global(std::locale("C")); std::locale::global(std::locale("C"));
// This enables printing all characters in bitmap font // This enables printing all characters in bitmap font
setlocale(LC_CTYPE, "en_US"); setlocale(LC_CTYPE, "en_US");
setlocale(LC_ALL, "");
bindtextdomain("minetest-c55", "./../locale");
textdomain("minetest-c55");
/* /*
Parse command line Parse command line
*/ */
@ -1136,6 +1132,10 @@ int main(int argc, char *argv[])
// Create user data directory // Create user data directory
fs::CreateDir(porting::path_userdata); fs::CreateDir(porting::path_userdata);
setlocale(LC_ALL, "");
bindtextdomain("minetest-c55", (porting::path_userdata+"/locale").c_str());
textdomain("minetest-c55");
// Initialize debug streams // Initialize debug streams
#ifdef RUN_IN_PLACE #ifdef RUN_IN_PLACE
std::string debugfile = DEBUGFILE; std::string debugfile = DEBUGFILE;