Merge branch 'develop'

TandoorRecipes · Nov 4, 2021 · afe46b3 · afe46b3
2 parents 4f1f123 + 4b5edb4
commit afe46b3
Show file tree

Hide file tree

Showing 70 changed files with 7,477 additions and 34,178 deletions.
diff --git a/cookbook/integration/cookbookapp.py b/cookbook/integration/cookbookapp.py
@@ -36,8 +36,8 @@ def get_recipe_from_file(self, file):
             pass
 
         try:
-            recipe.working_time = iso_duration_to_minutes(recipe_json['prep_time'])
-            recipe.waiting_time = iso_duration_to_minutes(recipe_json['cook_time'])
+            recipe.working_time = iso_duration_to_minutes(recipe_json['prepTime'])
+            recipe.waiting_time = iso_duration_to_minutes(recipe_json['cookTime'])
         except Exception:
             pass
 

diff --git a/cookbook/locale/ca/LC_MESSAGES/django.mo b/cookbook/locale/ca/LC_MESSAGES/django.mo