From c3389fb19bc3364b332e33ad7bdf6946a7b121a8 Mon Sep 17 00:00:00 2001 From: blitzmann Date: Thu, 25 Jun 2020 21:07:44 -0400 Subject: [PATCH] Add all languages to market groups --- db_update.py | 9 +++++---- eos/db/gamedata/marketGroup.py | 6 ++---- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/db_update.py b/db_update.py index 9c44e4d6c..1638671a5 100644 --- a/db_update.py +++ b/db_update.py @@ -257,12 +257,13 @@ def update_db(): def processMarketGroups(): print('processing marketgroups') data = _readData('fsd_binary', 'marketgroups', keyIdName='marketGroupID') - _addRows(data, eos.gamedata.MarketGroup, fieldMap={ + map = { 'name_en-us': 'name', - 'name_zh': 'marketGroupName_zh', 'description_en-us': 'description', - 'description_zh': 'marketGroupDescription_zh' - }) + } + map.update({'name'+v: 'marketGroupName'+v for (k, v) in eos.config.translation_mapping.items() if k != 'en_US'}) + map.update({'description' + v: 'marketGroupDescription' + v for (k, v) in eos.config.translation_mapping.items() if k != 'en_US'}) + _addRows(data, eos.gamedata.MarketGroup, fieldMap=map) def processMetaGroups(): print('processing metagroups') diff --git a/eos/db/gamedata/marketGroup.py b/eos/db/gamedata/marketGroup.py index 874e3b5c8..039973dac 100644 --- a/eos/db/gamedata/marketGroup.py +++ b/eos/db/gamedata/marketGroup.py @@ -26,10 +26,8 @@ import eos.config marketgroups_table = Table("invmarketgroups", gamedata_meta, Column("marketGroupID", Integer, primary_key=True), - Column("marketGroupName", String), - Column("marketGroupName_zh", String), - Column("marketGroupDescription", String), - Column("marketGroupDescription_zh", String), + *[Column("marketGroupName{}".format(lang), String) for lang in eos.config.translation_mapping.values()], + *[Column("marketGroupDescription{}".format(lang), String) for lang in eos.config.translation_mapping.values()], Column("hasTypes", Boolean), Column("parentGroupID", Integer, ForeignKey("invmarketgroups.marketGroupID", initially="DEFERRED", deferrable=True)),