From 038b7ce9316a3ddde2be712b69b17f0f09fc24f3 Mon Sep 17 00:00:00 2001 From: zhaoweny Date: Tue, 30 Jun 2020 15:15:15 +0800 Subject: [PATCH] i18n: fix 'Level Not learned' issue in #2202 (comment) --- gui/builtinContextMenus/skillAffectors.py | 4 ++-- gui/characterEditor.py | 6 +++--- service/character.py | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/gui/builtinContextMenus/skillAffectors.py b/gui/builtinContextMenus/skillAffectors.py index 2c56c115b..f2521955e 100644 --- a/gui/builtinContextMenus/skillAffectors.py +++ b/gui/builtinContextMenus/skillAffectors.py @@ -74,9 +74,9 @@ class ChangeAffectingSkills(ContextMenuSingle): def addSkill(self, rootMenu, skill, i): if i < 0: - label = "Not Learned" + label = _t("Not Learned") else: - label = "Level %s" % i + label = _t("Level %s") % i id = ContextMenuSingle.nextID() self.skillIds[id] = (skill, i) diff --git a/gui/characterEditor.py b/gui/characterEditor.py index b971551ba..20130075a 100644 --- a/gui/characterEditor.py +++ b/gui/characterEditor.py @@ -396,7 +396,7 @@ class SkillTreeView(wx.Panel): self.idUnlearned = wx.NewId() self.levelIds = {} self.idLevels = {} - self.levelIds[self.idUnlearned] = "Not learned" + self.levelIds[self.idUnlearned] = _t("Not learned") for level in range(6): id = wx.NewId() self.levelIds[id] = level @@ -529,7 +529,7 @@ class SkillTreeView(wx.Panel): iconId = self.skillBookDirtyImageId childId = tree.AppendItem(root, name, iconId, data=('skill', id)) - tree.SetItemText(childId, 1, _t("Level {}d").format(int(level) if isinstance(level, float) else level)) + tree.SetItemText(childId, 1, _t("Level {}d").format(int(level)) if isinstance(level, float) else level) def populateSkillTree(self, event=None): sChar = Character.getInstance() @@ -588,7 +588,7 @@ class SkillTreeView(wx.Panel): childId = tree.AppendItem(root, name, iconId, data=('skill', id)) - tree.SetItemText(childId, 1, _t("Level {}").format(int(level) if isinstance(level, float) else level)) + tree.SetItemText(childId, 1, _t("Level {}").format(int(level)) if isinstance(level, float) else level) def spawnMenu(self, event): item = event.GetItem() diff --git a/service/character.py b/service/character.py index c5f889e6a..130d63884 100644 --- a/service/character.py +++ b/service/character.py @@ -42,7 +42,7 @@ from eos.const import FittingSlot as es_Slot from eos.saveddata.fighter import Fighter as es_Fighter pyfalog = Logger(__name__) - +_t = wx.GetTranslation class CharacterImportThread(threading.Thread): @@ -319,7 +319,7 @@ class Character: @staticmethod def getSkillLevel(charID, skillID): skill = eos.db.getCharacter(charID).getSkill(skillID) - return float(skill.level) if skill.learned else "Not learned", skill.isDirty + return float(skill.level) if skill.learned else _t("Not learned"), skill.isDirty @staticmethod def getDirtySkills(charID):