Skip to content

armgit / wger

Public Imported from GitHub
0

Self hosted FLOSS fitness/workout, nutrition and weight tracker

Merge remote-tracking branch 'refs/remotes/origin/term-consistency' into feature/import-usda-products

Roland Geider352c19bea6dd
diff --cc wger/nutrition/off.py
index 7a52507b0,aac8307ad..936768938
--- a/wger/nutrition/off.py
+++ b/wger/nutrition/off.py
@@@ -57,14 -95,14 +57,14 @@@ def extract_info_from_off(product_data
code = product_data['code']
protein = product_data['nutriments']['proteins_100g']
carbs = product_data['nutriments']['carbohydrates_100g']
- sugars = product_data['nutriments'].get('sugars_100g', 0)
fat = product_data['nutriments']['fat_100g']
- saturated = product_data['nutriments'].get('saturated-fat_100g', 0)
# these are optional
+ saturated = product_data['nutriments'].get('saturated-fat_100g', None)
sodium = product_data['nutriments'].get('sodium_100g', None)
+ sugars = product_data['nutriments'].get('sugars_100g', None)
- fibre = product_data['nutriments'].get('fiber_100g', None)
+ fiber = product_data['nutriments'].get('fiber_100g', None)
- brand = product_data.get('brands', None)
+ brand = product_data.get('brands', '')
# License and author info
source_name = Source.OPEN_FOOD_FACTS.value