merge branch work back into trunk

[xonotic/netradiant.git] / radiant / main.cpp

diff --git a/radiant/main.cpp b/radiant/main.cpp
index 31a8511f3703fb6b0904b3b7aa1228823982a4fb..02369ac84a7e9dd5c51ae725fbd0b5f90f917a4f 100644 (file)
--- a/radiant/main.cpp
+++ b/radiant/main.cpp
@@ -420,6 +420,9 @@ void error_redirect (const gchar *domain, GLogLevelFlags log_level, const gchar
 //  Sys_FPrintf (SYS_NOCON, buf);
 }
 
+#define GETTEXT_PACKAGE "radiant"
+#define LOCALEDIR "lang"
+
 int main( int argc, char* argv[] ) {
        char *libgl, *ptr;
        int i, j, k;
@@ -447,7 +450,11 @@ int main( int argc, char* argv[] ) {
   }
 #endif
 
-  gtk_disable_setlocale();
+
+       bindtextdomain(GETTEXT_PACKAGE, LOCALEDIR);
+       bind_textdomain_codeset(GETTEXT_PACKAGE, "UTF-8");
+       textdomain(GETTEXT_PACKAGE);
+//  gtk_disable_setlocale();
 
   gtk_init(&argc, &argv);
 
@@ -579,7 +586,6 @@ int main( int argc, char* argv[] ) {
   we need to catch when it happens, to cleanup the stateful prefs which might be killing it
   and to turn on console logging for lookup of the problem
   this is the first part of the two step .pid system
-  http://zerowing.idsoftware.com/bugzilla/show_bug.cgi?id=297
   */
   g_pidFile = g_strTempPath.GetBuffer ();
   g_pidFile += "radiant.pid";
@@ -637,7 +643,6 @@ int main( int argc, char* argv[] ) {
   // (otherwise, they run it, crash it, and blame us for not forcing them hard enough to pay attention while installing)
   // make something idiot proof and someone will make better idiots, this may be overkill
   // let's leave it disabled in debug mode in any case
-  // http://zerowing.idsoftware.com/bugzilla/show_bug.cgi?id=431
 #ifndef _DEBUG
   //#define CHECK_VERSION
 #endif
@@ -717,7 +722,6 @@ int main( int argc, char* argv[] ) {
 
   /*!
   now the secondary game dependant .pid file
-  http://zerowing.idsoftware.com/bugzilla/show_bug.cgi?id=297
   */
   g_pidGameFile = g_PrefsDlg.m_rc_path->str;
   g_pidGameFile += "radiant-game.pid";
@@ -793,7 +797,6 @@ int main( int argc, char* argv[] ) {
     Sys_LogFile();
   }
 
-  // FIXME http://zerowing.idsoftware.com/bugzilla/show_bug.cgi?id=639
   // we should search in g_strTempPath, then move over to look at g_strAppPath?
 #ifdef _WIN32
   // fine tune the look of the app using a gtk rc file