X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fmain.cc;h=a123631a54cc0f2b3219b919e67f2f8767a49e9e;hb=1c94f6490e3f0bd4b35a001a9a530cee752100b0;hp=e8bfe43aa1f5c6d9060a57f3643bd0428eb01326;hpb=9ae577fb07d9aea2f48d7e0d9988f25e24893a63;p=ardour.git

diff --git a/gtk2_ardour/main.cc b/gtk2_ardour/main.cc
index e8bfe43aa1..a123631a54 100644
--- a/gtk2_ardour/main.cc
+++ b/gtk2_ardour/main.cc
@@ -18,10 +18,12 @@
 */
 
 #include <cstdlib>
-#include <signal.h>
 #include <cerrno>
 #include <vector>
 
+#include <signal.h>
+#include <locale.h>
+
 #include <sigc++/bind.h>
 #include <gtkmm/settings.h>
 
@@ -56,7 +58,7 @@
 #include "enums.h"
 #include "bundle_env.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 #ifdef PLATFORM_WINDOWS
 #include <fcntl.h> // Needed for '_fmode'
@@ -273,6 +275,8 @@ extern "C" {
 
 int ardour_main (int argc, char *argv[])
 
+#elif defined NOMAIN
+int nomain (int argc, char *argv[])
 #else
 int main (int argc, char *argv[])
 #endif
@@ -288,11 +292,17 @@ int main (int argc, char *argv[])
 	}
 
 #ifdef HAVE_FFTW35F
-	ftwf_make_planner_thread_safe ();
+	fftwf_make_planner_thread_safe ();
 #endif
 
 #ifdef ENABLE_NLS
-	gtk_set_locale ();
+	/* initialize C and C++ locales to user preference */
+	setlocale (LC_ALL, "");
+	try {
+		std::locale::global (std::locale (setlocale (LC_ALL, 0)));
+	} catch (...) {
+		std::cerr << "Cannot set C++ locale\n";
+	}
 #endif
 
 	console_madness_begin();
@@ -375,6 +385,8 @@ int main (int argc, char *argv[])
 	}
 #endif
 
+	DEBUG_TRACE (DEBUG::Locale, string_compose ("main() locale '%1'\n", setlocale (LC_NUMERIC, NULL)));
+
 	if (UIConfiguration::instance().pre_gui_init ()) {
 		error << _("Could not complete pre-GUI initialization") << endmsg;
 		exit (1);