Increased robustness of get_lang() function

svn path=/trunk/; revision=940

ChangeLog

@@ -1,3 +1,8 @@
+2008-10-24  Curtis Gedak  <gedakc@gmail.com>
+
+	* src/Utils.cc: Increased robustness of get_lang() function
+	  - Assists with GParted bug #556965
+
 2008-10-17  Curtis Gedak  <gedakc@gmail.com>
 
 	* src/Dialog_Progress.cc: Converted more words for translation

src/Utils.cc

@@ -361,10 +361,15 @@ Glib::ustring Utils::get_lang()
 	//Extract base language from string that may look like "en_CA.UTF-8"
 	//  and return in the form "en-CA"
 	Glib::ustring lang = setlocale( LC_CTYPE, NULL ) ;
+
+	//Strip off anything after the period "." or at sign "@"
+	lang = Utils::regexp_label( lang .c_str(), "^([^.@]*)") ;
+
+	//Convert the underscore "_" to a hyphen "-"
 	Glib::ustring sought = "_" ;
 	Glib::ustring replacement = "-" ;
-	lang = Utils::regexp_label( lang .c_str(), "^([^.]*)") ;
 	lang .replace( lang .find(sought), sought .size(), replacement ) ;
+
 	return lang ;
 }