[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [52448] trunk/blender/intern/locale/ boost_locale_wrapper.cpp: OSX/locale: moved command up, so errorchecking also happens

[jens verwiebe]

Revision: 52448
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=52448
Author:   jensverwiebe
Date:     2012-11-21 14:29:34 +0000 (Wed, 21 Nov 2012)
Log Message:
-----------
OSX/locale: moved command up, so errorchecking also happens

Modified Paths:
--------------
    trunk/blender/intern/locale/boost_locale_wrapper.cpp

Modified: trunk/blender/intern/locale/boost_locale_wrapper.cpp
===================================================================
--- trunk/blender/intern/locale/boost_locale_wrapper.cpp	2012-11-21 13:54:54 UTC (rev 52447)
+++ trunk/blender/intern/locale/boost_locale_wrapper.cpp	2012-11-21 14:29:34 UTC (rev 52448)
@@ -58,25 +58,25 @@
 	// Specify location of dictionaries.
 	gen.add_messages_path(messages_path);
 	gen.add_messages_domain(default_domain);
-	//gen.set_default_messages_domain(default_domain);
-
+	//gen.set_default_messages_domain(default_domain);	
+#if defined (__APPLE__)
+	// workaround to get osx system locale from user defaults
+	FILE* fp;
+	char result [10];
+	char osx_locale [10];
+	fp = popen("defaults read .GlobalPreferences AppleLocale","r");
+	fread(result,1,sizeof(result),fp);
+	fclose (fp);
+	sprintf(osx_locale, """%s.UTF-8""", result);
+	locale = osx_locale;
+#endif
 	if (locale && locale[0]) {
 		std::locale::global(gen(locale));
 	}
+
 	else {
-#if defined (__APPLE__)
-		// workaround to get osx system locale from user defaults
-		FILE* fp;
-		char result [10];
-		char osx_locale [10];
-		fp = popen("defaults read .GlobalPreferences AppleLocale","r");
-		fread(result,1,sizeof(result),fp);
-		fclose (fp);
-		sprintf(osx_locale, """%s.UTF-8""", result);
-		std::locale::global(gen(osx_locale));
-#else
+
 		std::locale::global(gen(""));
-#endif
 	}
 	// Note: boost always uses "C" LC_NUMERIC by default!
 }