Merge the branch term-consistency

Also, make sure just rename the field and don't accidentally nuke the fibre field ;)

Author: rolandgeider

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 @@ def sanity_checks(self):
             'carbohydrates',
             'carbohydrates_sugar',
             'sodium',
-            'fibres',
+            'fiber',
         ]
         for macro in macros:
             value = getattr(self, macro)

wger/nutrition/migrations/0022_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',

wger/nutrition/migrations/0023_rename_goal_fibers_nutritionplan_goal_fiber.py renamed to wger/nutrition/migrations/0023_fiber_spelling.py

@@ -218,7 +218,7 @@ def test_regular_response(self):
             carbohydrates_sugar=None,
             fat=3.24,
             fat_saturated=None,
-            fibres=None,
+            fiber=None,
             sodium=None,
             code=None,
             source_name='USDA',
@@ -228,7 +228,7 @@ def test_regular_response(self):
             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',
         )

wger/nutrition/tests/test_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,