Skip to content

armgit / wger

Public Imported from GitHub
0

Self hosted FLOSS fitness/workout, nutrition and weight tracker

Merge the branch term-consistency

Roland Geider234cef49fb59
diff --git a/wger/nutrition/dataclasses.py b/wger/nutrition/dataclasses.py
index b1c2b0555..49b9dfb49 100644
--- a/wger/nutrition/dataclasses.py
+++ b/wger/nutrition/dataclasses.py
@@ -31,7 +31,7 @@ class IngredientData:
carbohydrates_sugar: Optional[float]
fat: float
fat_saturated: Optional[float]
- fibres: Optional[float]
+ fiber: Optional[float]
sodium: Optional[float]
code: Optional[str]
source_name: str
@@ -58,7 +58,7 @@ class IngredientData:
'carbohydrates',
'carbohydrates_sugar',
'sodium',
- 'fibres',
+ 'fiber',
]
for macro in macros:
value = getattr(self, macro)
diff --git a/wger/nutrition/migrations/0022_fiber_spelling.py b/wger/nutrition/migrations/0022_fiber_spelling.py
deleted file mode 100644
index ad28bd083..000000000
--- a/wger/nutrition/migrations/0022_fiber_spelling.py
+++ /dev/null
@@ -1,23 +0,0 @@
-# Generated by Django 4.2.6 on 2024-05-21 19:32
-
-import django.core.validators
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
- dependencies = [
- ('nutrition', '0021_add_fibers_field'),
- ]
-
- operations = [
- migrations.RemoveField(
- model_name='ingredient',
- name='fibres',
- ),
- migrations.AddField(
- model_name='ingredient',
- name='fiber',
- field=models.DecimalField(blank=True, decimal_places=3, help_text='In g per 100g of product', max_digits=6, null=True, validators=[django.core.validators.MinValueValidator(0), django.core.validators.MaxValueValidator(100)], verbose_name='Fiber'),
- ),
- ]
diff --git a/wger/nutrition/migrations/0023_rename_goal_fibers_nutritionplan_goal_fiber.py b/wger/nutrition/migrations/0023_fiber_spelling.py
similarity index 51%
rename from wger/nutrition/migrations/0023_rename_goal_fibers_nutritionplan_goal_fiber.py
rename to wger/nutrition/migrations/0023_fiber_spelling.py
index 8a26f5140..a2b0dd123 100644
--- a/wger/nutrition/migrations/0023_rename_goal_fibers_nutritionplan_goal_fiber.py
+++ b/wger/nutrition/migrations/0023_fiber_spelling.py
@@ -1,15 +1,19 @@
-# Generated by Django 4.2.6 on 2024-05-21 19:40
+# Generated by Django 4.2.6 on 2024-05-21 19:32
from django.db import migrations
class Migration(migrations.Migration):
-
dependencies = [
- ('nutrition', '0022_fiber_spelling'),
+ ('nutrition', '0022_add_remote_id_increase_author_field_length'),
]
operations = [
+ migrations.RenameField(
+ model_name='ingredient',
+ old_name='fibres',
+ new_name='fiber',
+ ),
migrations.RenameField(
model_name='nutritionplan',
old_name='goal_fibers',
diff --git a/wger/nutrition/tests/test_usda.py b/wger/nutrition/tests/test_usda.py
index 4fa0fc643..8dc7895d1 100644
--- a/wger/nutrition/tests/test_usda.py
+++ b/wger/nutrition/tests/test_usda.py
@@ -218,7 +218,7 @@ class ExtractInfoFromUSDATestCase(SimpleTestCase):
carbohydrates_sugar=None,
fat=3.24,
fat_saturated=None,
- fibres=None,
+ fiber=None,
sodium=None,
code=None,
source_name='USDA',
@@ -228,7 +228,7 @@ class ExtractInfoFromUSDATestCase(SimpleTestCase):
status=AbstractSubmissionModel.STATUS_ACCEPTED,
license_id=CC_0_LICENSE_ID,
license_author='U.S. Department of Agriculture, Agricultural Research Service, '
- 'Beltsville Human Nutrition Research Center. FoodData Central.',
+ 'Beltsville Human Nutrition Research Center. FoodData Central.',
license_title='Foo With Chocolate',
license_object_url='https://fdc.nal.usda.gov/fdc-app.html#/food-details/1234567/nutrients',
)
diff --git a/wger/nutrition/usda.py b/wger/nutrition/usda.py
index ac0f0cb36..2c432b6a0 100644
--- a/wger/nutrition/usda.py
+++ b/wger/nutrition/usda.py
@@ -111,7 +111,7 @@ def extract_info_from_usda(product_data: dict, language: int) -> IngredientData:
carbohydrates_sugar=carbs_sugars,
fat=fats,
fat_saturated=fats_saturated,
- fibres=fiber,
+ fiber=fiber,
sodium=sodium,
source_name=source_name,
source_url=source_url,