diff --git a/db_update.py b/db_update.py index 1638671a5..25f9d40ef 100644 --- a/db_update.py +++ b/db_update.py @@ -149,8 +149,9 @@ def update_db(): 1983) # the "container" for the abyssal environments ): newData.append(row) - - _addRows(newData, eos.gamedata.Item, fieldMap={'typeName_en-us': 'typeName', 'description_en-us': 'description'}) + map = {'typeName_en-us': 'typeName', 'description_en-us': 'description'} + map.update({'description'+v: '_description'+v for (k, v) in eos.config.translation_mapping.items() if k != 'en_US'}) + _addRows(newData, eos.gamedata.Item, fieldMap=map) return newData def processEveGroups(): diff --git a/eos/db/gamedata/item.py b/eos/db/gamedata/item.py index b56d412d3..4c8c3b01a 100644 --- a/eos/db/gamedata/item.py +++ b/eos/db/gamedata/item.py @@ -32,7 +32,7 @@ import eos.config items_table = Table("invtypes", gamedata_meta, Column("typeID", Integer, primary_key=True), *[Column("typeName{}".format(lang), String, index=True) for lang in eos.config.translation_mapping.values()], - *[Column("description{}".format(lang), String, index=True) for lang in eos.config.translation_mapping.values()], + *[Column("typeDescription{}".format(lang), String, index=True) for lang in eos.config.translation_mapping.values()], Column("raceID", Integer), Column("factionID", Integer), Column("published", Boolean), @@ -75,7 +75,7 @@ props = { # Create deferred columns shadowing all the description fields. The literal `description` property will dynamically # be assigned as synonym to one of these -props.update({'_description' + v: deferred(items_table.c['description' + v]) for (k, v) in eos.config.translation_mapping.items()}) +props.update({'_description' + v: deferred(items_table.c['typeDescription' + v]) for (k, v) in eos.config.translation_mapping.items()}) mapper(Item, items_table, properties=props)