Index: ascxx/ascpy.i
===================================================================
--- ascxx/ascpy.i	(revision 3345)
+++ ascxx/ascpy.i	(working copy)
@@ -176,13 +176,14 @@
 
 %include "dimensions.h"
 %include "units.h"
+import locale
 
 %extend UnitsM{
 	%pythoncode{
 		def getConvertedValue(self,si_value):
 			"""Return an SI value converted to self's units of measurement."""
 			_v = si_value / self.getConversion()
-			_s = str(_v)
+			_s = locale.str(_v)
 			_n = self.getName().toString()
 			if _n=="1":
 				return _s
Index: pygtk/varentry.py
===================================================================
--- pygtk/varentry.py	(revision 3345)
+++ pygtk/varentry.py	(working copy)
@@ -4,10 +4,12 @@
 
 import re
 import ascpy
-
+import locale
 # RE for units matching
-UNITS_RE = re.compile("([-+]?(\d+(\.\d*)?|\d*\.d+)([eE][-+]?\d+)?)\s*(.*)");
+dot = locale.localeconv()['decimal_point']
 
+UNITS_RE = re.compile("([-+]?(\\d+(\\" + dot + "\\d*)?|\\d*\\" + dot + "\\d+)([eE][-+]?\\d+)?)\\s*(.*)");
+
 class InputError(Exception):
 	def __init__(self,msg):
 		self.msg = msg;
@@ -42,7 +44,8 @@
 
 		# parse the units, throw an error if no good
 		try:
-			_val = float(_val)
+			print "CONVERTING '%s' TO FLOAT..." % _vals
+			_val = locale.atof(_val)
 		except RuntimeError:
 			raise InputError("Unable to convert number part '%s' to float" % _val)
 
@@ -73,7 +76,7 @@
 				raise InputError("Incompatible units '%s' (must fit with '%s')" 
 						% (self.units, _my_dims.getName().toString()) )
 	
-		_conv = float(_u.getConversion())
+		_conv = _u.getConversion()
 		# self.reporter.reportNote("Converting: multiplying '%s %s' by factor %s to get SI units" % (_val, _units, _conv) )
 		self.value = _val * _conv;