X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fcocoacarbon.mm;h=65648439726ddc3f870b1d5493f3240d5e7f2583;hb=79794650c10dc7ca027ea74153968dc829cd726e;hp=76b92cb91fa9b8a89366511de173e96d13fadb2c;hpb=5f15bc9f9fe8decfab02db7821b7b15e1d7d95ac;p=ardour.git

diff --git a/gtk2_ardour/cocoacarbon.mm b/gtk2_ardour/cocoacarbon.mm
index 76b92cb91f..6564843972 100644
--- a/gtk2_ardour/cocoacarbon.mm
+++ b/gtk2_ardour/cocoacarbon.mm
@@ -25,6 +25,9 @@
 #undef check
 #undef YES
 #undef NO
+#ifdef verify
+#undef verify
+#endif
 
 #include "ardour_ui.h"
 #include "actions.h"
@@ -75,14 +78,6 @@ set_language_preference ()
 {
 	gtk_disable_setlocale ();
 
-	if (g_getenv ("LANGUAGE") || g_getenv ("LC_ALL") || g_getenv ("LANG")) {
-		return;
-	}
-
-	if (g_getenv ("ARDOUR_EN")) {
-		return;
-	}
-
 	/* the gettext manual is potentially misleading about the utility of
 	   LANGUAGE.  It notes that if LANGUAGE is set to include a dialect/region-free
 	   language code, like "it", it will assume that you mean the main
@@ -126,6 +121,6 @@ set_language_preference ()
 	 */
 
 	cout << "LANG set to " << [nslocale UTF8String] << endl;
-	setenv ("LANG", [nslocale UTF8String], 0);
+        setenv ("LANG", [nslocale UTF8String], 0);
 	CFRelease (cflocale);
 }