[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [56452] trunk/blender/intern/locale/ boost_locale_wrapper.cpp: Actually, this should do better, sorry for the noise :/

[Bastien Montagne]

Revision: 56452
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=56452
Author:   mont29
Date:     2013-05-01 17:14:33 +0000 (Wed, 01 May 2013)
Log Message:
-----------
Actually, this should do better, sorry for the noise :/

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	2013-05-01 17:11:07 UTC (rev 56451)
+++ trunk/blender/intern/locale/boost_locale_wrapper.cpp	2013-05-01 17:14:33 UTC (rev 56452)
@@ -76,21 +76,23 @@
 #endif
 		}
 		// Note: boost always uses "C" LC_NUMERIC by default!
-	}
-	catch(std::exception const &e) {
-		std::cout << "bl_locale_set(" << locale << "): " << e.what() << " \n";
-		return;
-	}
 
-	/* Generate the locale string (useful to know which locale we are actually using in case of "default" one). */
+		/* Generate the locale string (useful to know which locale we are actually using in case of "default" one). */
 #define LOCALE_INFO std::use_facet<boost::locale::info>(_locale)
 
-	locale_str = LOCALE_INFO.language();
-	if (LOCALE_INFO.country() != "") {
-		locale_str += "_" + LOCALE_INFO.country();
+		locale_str = LOCALE_INFO.language();
+		if (LOCALE_INFO.country() != "") {
+			locale_str += "_" + LOCALE_INFO.country();
+		}
+		if (LOCALE_INFO.variant() != "") {
+			locale_str += "@" + LOCALE_INFO.variant();
+		}
+
+#undef LOCALE_INFO
+
 	}
-	if (LOCALE_INFO.variant() != "") {
-		locale_str += "@" + LOCALE_INFO.variant();
+	catch(std::exception const &e) {
+		std::cout << "bl_locale_set(" << locale << "): " << e.what() << " \n";
 	}
 }