diff --git a/gui/builtinStatsViews/priceViewFull.py b/gui/builtinStatsViews/priceViewFull.py index ea7d53340..593a2ab8e 100644 --- a/gui/builtinStatsViews/priceViewFull.py +++ b/gui/builtinStatsViews/priceViewFull.py @@ -23,7 +23,6 @@ from gui import builtinStatsViews from gui.bitmapLoader import BitmapLoader from gui.utils.numberFormatter import formatAmount import service -import locale class PriceViewFull(StatsView): name = "priceViewFull" @@ -107,15 +106,15 @@ class PriceViewFull(StatsView): if self._cachedShip != shipPrice: self.labelPriceShip.SetLabel("%s ISK" % formatAmount(shipPrice, 3, 3, 9, currency=True)) - self.labelPriceShip.SetToolTip(wx.ToolTip(locale.format('%.2f', shipPrice, 1))) + self.labelPriceShip.SetToolTip(wx.ToolTip('{:,.2f}'.format(shipPrice))) self._cachedShip = shipPrice if self._cachedFittings != modPrice: self.labelPriceFittings.SetLabel("%s ISK" % formatAmount(modPrice, 3, 3, 9, currency=True)) - self.labelPriceFittings.SetToolTip(wx.ToolTip(locale.format('%.2f', modPrice, 1))) + self.labelPriceFittings.SetToolTip(wx.ToolTip('{:,.2f}'.format(modPrice))) self._cachedFittings = modPrice if self._cachedTotal != (shipPrice+modPrice): self.labelPriceTotal.SetLabel("%s ISK" % formatAmount(shipPrice + modPrice, 3, 3, 9, currency=True)) - self.labelPriceTotal.SetToolTip(wx.ToolTip(locale.format('%.2f', (shipPrice + modPrice), 1))) + self.labelPriceTotal.SetToolTip(wx.ToolTip('{:,.2f}'.format(shipPrice + modPrice))) self._cachedTotal = shipPrice + modPrice self.panel.Layout() diff --git a/gui/builtinStatsViews/targetingMiscViewFull.py b/gui/builtinStatsViews/targetingMiscViewFull.py index d2916f317..af6a195ad 100644 --- a/gui/builtinStatsViews/targetingMiscViewFull.py +++ b/gui/builtinStatsViews/targetingMiscViewFull.py @@ -22,7 +22,6 @@ from gui.statsView import StatsView from gui import builtinStatsViews from gui.utils.numberFormatter import formatAmount import locale - try: from collections import OrderedDict except ImportError: @@ -201,17 +200,15 @@ class TargetingMiscViewFull(StatsView): label.SetToolTip(wx.ToolTip("Type: %s" % (fit.scanType))) elif labelName == "labelFullAlignTime": alignTime = "Align:\t%.3fs"%mainValue - mass = "Mass:\t%skg"%locale.format('%d', fit.ship.getModifiedItemAttr("mass"), 1) + mass = 'Mass:\t{:,.0f}kg'.format(fit.ship.getModifiedItemAttr("mass")) agility = "Agility:\t%.3fx"%fit.ship.getModifiedItemAttr("agility") label.SetToolTip(wx.ToolTip("%s\n%s\n%s" % (alignTime, mass, agility))) elif labelName == "labelFullCargo": tipLines = [] - tipLines.append(u"Cargohold: %sm\u00B3 / %sm\u00B3"% ( - locale.format('%.2f', fit.cargoBayUsed, 1), - locale.format('%.2f', newValues["main"], 1))) + tipLines.append(u"Cargohold: {:,.2f}m\u00B3 / {:,.2f}m\u00B3".format(fit.cargoBayUsed, newValues["main"])) for attrName, tipAlias in cargoNamesOrder.items(): if newValues[attrName] > 0: - tipLines.append(u"%s: %sm\u00B3"% (tipAlias, locale.format('%.2f', newValues[attrName], 1))) + tipLines.append(u"{}: {:,.2f}m\u00B3".format(tipAlias, newValues[attrName])) label.SetToolTip(wx.ToolTip(u"\n".join(tipLines))) else: label.SetToolTip(wx.ToolTip("%.1f" % mainValue)) @@ -237,12 +234,10 @@ class TargetingMiscViewFull(StatsView): # if you add stuff to cargo, the capacity doesn't change and thus it is still cached # This assures us that we force refresh of cargo tooltip tipLines = [] - tipLines.append(u"Cargohold: %sm\u00B3 / %sm\u00B3"% ( - locale.format('%.2f', fit.cargoBayUsed, 1), - locale.format('%.2f', cachedCargo["main"], 1))) + tipLines.append(u"Cargohold: {:,.2f}m\u00B3 / {:,.2f}m\u00B3".format(fit.cargoBayUsed, cachedCargo["main"])) for attrName, tipAlias in cargoNamesOrder.items(): if cachedCargo[attrName] > 0: - tipLines.append(u"%s: %sm\u00B3"% (tipAlias, locale.format('%.2f', cachedCargo[attrName], 1))) + tipLines.append(u"{}: {:,.2f}m\u00B3".format(tipAlias, cachedCargo[attrName])) label.SetToolTip(wx.ToolTip(u"\n".join(tipLines))) else: label.SetToolTip(wx.ToolTip("")) diff --git a/gui/mainFrame.py b/gui/mainFrame.py index ba49622eb..a7741aa38 100644 --- a/gui/mainFrame.py +++ b/gui/mainFrame.py @@ -120,8 +120,6 @@ class MainFrame(wx.Frame): self.title="pyfa %s%s - Python Fitting Assistant"%(config.version, "" if config.tag.lower() != 'git' else " (git)") wx.Frame.__init__(self, None, wx.ID_ANY, self.title) - self.locale = wx.Locale(wx.LANGUAGE_ENGLISH) - MainFrame.__instance = self #Load stored settings (width/height/maximized..)