X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=Cura%2Fgui%2FconfigBase.py;h=3cf6a1d0eaf87abe149a241738330025173f4e21;hb=970cddfb5b17157317fae15eaff5e35998618833;hp=042ca3888f1c848cf97fc648bd000c8f7b51820c;hpb=8e603e35f789cefeceb2a03ee17a603cba99a4f0;p=cura.git

diff --git a/Cura/gui/configBase.py b/Cura/gui/configBase.py
index 042ca388..3cf6a1d0 100644
--- a/Cura/gui/configBase.py
+++ b/Cura/gui/configBase.py
@@ -180,8 +180,12 @@ class SettingRow(object):
 			choices = self.setting.getType()
 			if valueOverride is not None:
 				choices = valueOverride
+			self._englishChoices = choices[:]
 			if value not in choices and len(choices) > 0:
 				value = choices[0]
+			for n in xrange(0, len(choices)):
+				choices[n] = _(choices[n])
+			value = _(value)
 			self.ctrl = wx.ComboBox(panel, -1, value, choices=choices, style=wx.CB_DROPDOWN|wx.CB_READONLY)
 			self.ctrl.Bind(wx.EVT_COMBOBOX, self.OnSettingChange)
 			self.ctrl.Bind(wx.EVT_LEFT_DOWN, self.OnMouseExit)
@@ -237,6 +241,12 @@ class SettingRow(object):
 	def GetValue(self):
 		if isinstance(self.ctrl, wx.ColourPickerCtrl):
 			return str(self.ctrl.GetColour().GetAsString(wx.C2S_HTML_SYNTAX))
+		elif isinstance(self.ctrl, wx.ComboBox):
+			value = str(self.ctrl.GetValue())
+			for ret in self._englishChoices:
+				if _(ret) == value:
+					return ret
+			return value
 		else:
 			return str(self.ctrl.GetValue())
 
@@ -250,5 +260,7 @@ class SettingRow(object):
 				self.ctrl.SetValue(float(value))
 			except ValueError:
 				pass
+		elif isinstance(self.ctrl, wx.ComboBox):
+			self.ctrl.SetValue(_(value))
 		else:
 			self.ctrl.SetValue(value)