Merge branch 'develop' into feature/vue3

# Conflicts:
#	recipes/settings.py
#	requirements.txt

.github/workflows/ci.yml

@@ -13,7 +13,7 @@ jobs:
                 node-version: ["18"]
         steps:
             - uses: actions/checkout@v4
-            - uses: awalsh128/cache-apt-pkgs-action@v1.4.2
+            - uses: awalsh128/cache-apt-pkgs-action@v1.4.3
               with:
                   packages: libsasl2-dev python3-dev libldap2-dev libssl-dev
                   version: 1.0

recipes/settings.py

@@ -48,8 +48,8 @@ STATIC_ROOT = os.path.join(BASE_DIR, "staticfiles")
 # Get vars from .env files
 SECRET_KEY = os.getenv('SECRET_KEY', 'INSECURE_STANDARD_KEY_SET_IN_ENV')
 
-DEBUG = extract_bool('DEBUG', False)
-DEBUG_TOOLBAR = extract_bool('DEBUG_TOOLBAR', False)
+DEBUG = bool(int(os.getenv('DEBUG', '0')))
+DEBUG_TOOLBAR = bool(int(os.getenv('DEBUG_TOOLBAR', '0')))
 
 LOG_LEVEL = os.getenv("LOG_LEVEL", "WARNING")
 

requirements.txt

@@ -6,16 +6,16 @@ django-crispy-forms==2.3
 crispy-bootstrap4==2024.10
 django-tables2==2.7.4
 djangorestframework==3.15.2
-drf-writable-nested==0.7.0
 drf-spectacular==0.27.1
 drf-spectacular-sidecar==2024.2.1
+drf-writable-nested==0.7.1
 django-oauth-toolkit==2.4.0
 django-debug-toolbar==4.3.0
 bleach==6.0.0
 gunicorn==22.0.0
 lxml==5.3.0
 Markdown==3.5.1
-Pillow==10.4.0
+Pillow==11.1.0
 psycopg2-binary==2.9.9
 python-dotenv==1.0.0
 requests==2.32.3
@@ -31,14 +31,14 @@ mock==5.1.0
 Jinja2==3.1.5
 django-webpack-loader==3.0.1
 git+https://github.com/BITSOLVER/django-js-reverse@071e304fd600107bc64bbde6f2491f1fe049ec82
-django-allauth==0.61.1
+django-allauth==65.3.1
 recipe-scrapers==15.4.0
 django-scopes==2.0.0
 django-treebeard==4.7
 django-cors-headers==4.6.0
 django-storages==1.14.2
 boto3==1.28.75
-django-prometheus==2.2.0
+django-prometheus==2.3.1
 django-hCaptcha==0.2.0
 python-ldap==3.4.4
 django-auth-ldap==4.6.0
@@ -58,6 +58,6 @@ pytest-factoryboy==2.7.0
 pytest-html==4.1.1
 pytest-asyncio==0.23.5
 pytest-xdist==3.6.1
-autopep8==2.0.4
+autopep8==2.3.2
 flake8==7.1.1
 yapf==0.40.2

vue/src/locales/pt.json

@@ -411,5 +411,9 @@
     "Copy Link": "Copiar Ligação",
     "Theme": "Tema",
     "one_url_per_line": "Um URL por linha",
-    "Original_Text": "Texto original"
+    "Original_Text": "Texto original",
+    "err_importing_recipe": "Ocorreu um erro ao importar a receita!",
+    "recipe_property_info": "Você também pode adicionar propriedades aos alimentos para calculá-los automaticamente de acordo com sua receita!",
+    "open_data_help_text": "O projeto Tandoor Open Data fornece dados contribuídos pela comunidade. Este campo é preenchido automaticamente ao importá-lo e permite atualizações no futuro.",
+    "per_serving": "por porção"
 }