diff --git a/shares.py b/shares.py index cf0376917..b84d6ecd3 100644 --- a/shares.py +++ b/shares.py @@ -293,8 +293,8 @@ def addShare(baseDir: str, "location": location, "published": published, "expire": durationSec, - "price": price, - "currency": currency + "itemPrice": price, + "itemCurrency": currency } saveJson(sharesJson, sharesFilename) @@ -1296,7 +1296,7 @@ def _dfcToSharesFormat(catalogJson: {}, "location": "", "published": item['DFC:startDate'], "expire": durationSec, - "price": item['DFC:price'].split(' ')[0], - "currency": item['DFC:price'].split(' ')[1] + "itemPrice": item['DFC:price'].split(' ')[0], + "itemCurrency": item['DFC:price'].split(' ')[1] } return sharesJson diff --git a/webapp_search.py b/webapp_search.py index bc80379a6..6461a4d35 100644 --- a/webapp_search.py +++ b/webapp_search.py @@ -139,7 +139,7 @@ def _htmlSearchResultShare(sharedItem: {}, translate: {}, if sharedItem.get('itemQty'): sharedItemsForm += \ '' + translate['Quantity'] + \ - ': ' + str(sharedItem['itemQty']) + ' ' + ': ' + str(sharedItem['itemQty']) + '
' sharedItemsForm += \ '' + translate['Type'] + ': ' + sharedItem['itemType'] + ' ' sharedItemsForm += \ diff --git a/webapp_timeline.py b/webapp_timeline.py index e96c2da0f..734aee703 100644 --- a/webapp_timeline.py +++ b/webapp_timeline.py @@ -828,7 +828,7 @@ def htmlIndividualShare(actor: str, item: {}, translate: {}, if item.get('itemQty'): profileStr += \ '' + translate['Quantity'] + ': ' + \ - str(item['itemQty']) + ' ' + str(item['itemQty']) + '
' profileStr += \ '' + translate['Type'] + ': ' + item['itemType'] + ' ' profileStr += \