From 7451ce147eb9d4cbd2c125f72114c0b75fe4a8ec Mon Sep 17 00:00:00 2001 From: blitzmann Date: Fri, 10 Jul 2020 23:36:52 -0400 Subject: [PATCH] Create a dummy translation annotation for damage patterns, and do translations on the GUI side --- eos/saveddata/damagePattern.py | 6 +++++- gui/builtinContextMenus/damagePatternChange.py | 6 +++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/eos/saveddata/damagePattern.py b/eos/saveddata/damagePattern.py index 6c4670ddb..16a13116f 100644 --- a/eos/saveddata/damagePattern.py +++ b/eos/saveddata/damagePattern.py @@ -25,7 +25,7 @@ from sqlalchemy.orm import reconstructor import eos.db -_t = wx.GetTranslation +_t = lambda x: x # Order is significant here - UI uses order as-is for built-in patterns BUILTINS = OrderedDict([ @@ -340,6 +340,10 @@ class DamagePattern: categories.append(remainingName[start + 1:end]) remainingName = remainingName[end + 1:].strip() + @property + def isBuiltin(self): + return self.ID < 0 + def __deepcopy__(self, memo): p = DamagePattern(self.emAmount, self.thermalAmount, self.kineticAmount, self.explosiveAmount) p.rawName = "%s copy" % self.rawName diff --git a/gui/builtinContextMenus/damagePatternChange.py b/gui/builtinContextMenus/damagePatternChange.py index b26c6e0f4..a769cd6b9 100644 --- a/gui/builtinContextMenus/damagePatternChange.py +++ b/gui/builtinContextMenus/damagePatternChange.py @@ -11,6 +11,8 @@ from gui.utils.sorter import smartSort from service.damagePattern import DamagePattern as DmgPatternSvc from service.fit import Fit +_t = wx.GetTranslation + class ChangeDamagePattern(ContextMenuUnconditional): @@ -43,8 +45,10 @@ class ChangeDamagePattern(ContextMenuUnconditional): for pattern in self.patterns: container = self.items for categoryName in pattern.hierarchy: + categoryName = _t('[' + categoryName + ']')[1:-1] if pattern.isBuiltin else categoryName container = container[1].setdefault(categoryName, (OrderedDict(), OrderedDict())) - container[0][pattern.shortName] = pattern + shortName = _t(pattern.shortName) if pattern.isBuiltin else pattern.shortName + container[0][shortName] = pattern return list(self.items[0].keys()) + list(self.items[1].keys())