diff options
| author | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2009-02-09 20:19:39 +0100 |
|---|---|---|
| committer | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2009-02-09 21:10:48 +0100 |
| commit | 32bfe1ddf26413fc660bed9ea29765fcabb90eb3 (patch) | |
| tree | 29d0d6274696560b1bb94b762456f4b511f0311b /src/main.cpp | |
| parent | 112d71798eca4b13dd5b11805669ae4fad4dea0e (diff) | |
| parent | d2876ad85935c5d0b181d050bd4c19a4682123b1 (diff) | |
| download | mana-32bfe1ddf26413fc660bed9ea29765fcabb90eb3.tar.gz mana-32bfe1ddf26413fc660bed9ea29765fcabb90eb3.tar.bz2 mana-32bfe1ddf26413fc660bed9ea29765fcabb90eb3.tar.xz mana-32bfe1ddf26413fc660bed9ea29765fcabb90eb3.zip | |
Merge branch 'master' of git@gitorious.org:tmw/eathena
Conflicts:
src/game.cpp
src/net/charserverhandler.cpp
src/net/loginhandler.cpp
src/net/protocol.h
Diffstat (limited to 'src/main.cpp')
| -rw-r--r-- | src/main.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/main.cpp b/src/main.cpp index 6866093f..fb5486d5 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -739,9 +739,12 @@ int main(int argc, char *argv[]) #if ENABLE_NLS #ifdef WIN32 putenv(("LANG=" + std::string(_nl_locale_name_default())).c_str()); + // mingw doesn't like LOCALEDIR to be defined for some reason + bindtextdomain("tmw", "translations/"); +#else + bindtextdomain("tmw", LOCALEDIR); #endif setlocale(LC_MESSAGES, ""); - bindtextdomain("tmw", LOCALEDIR); bind_textdomain_codeset("tmw", "UTF-8"); textdomain("tmw"); #endif |