Merge branch 'main' into feat/821-switch-long-and-short-click-in-food-plan

Author: crosspolar

backend/app/config.py

@@ -38,7 +38,7 @@ def get_secret(env_var: str, default: str = None) -> str | None:
     file_path = os.getenv(f"{env_var}_FILE")
     if file_path:
         try:
-            with open(file_path, "r") as f:
+            with open(file_path, "r", encoding="utf-8") as f:
                 return f.read().strip()
         except Exception as e:
             raise RuntimeError(f"Failed to read {env_var}_FILE: {e}")

backend/app/service/file_has_access_or_download.py

@@ -31,7 +31,9 @@ def file_has_access_or_download(
         ext = guess_extension(resp.headers["content-type"])
         if ext and allowed_file("file" + ext):
             filename = secure_filename(str(uuid.uuid4()) + ext)
-            with open(os.path.join(UPLOAD_FOLDER, filename), "wb") as o:
+            with open(
+                os.path.join(UPLOAD_FOLDER, filename), "wb", encoding="utf-8"
+            ) as o:
                 o.write(resp.content)
             blur = None
             try:

backend/app/service/import_language.py

@@ -12,9 +12,11 @@ def importLanguage(household_id: int, lang: str, bulkSave: bool = False):
         file_path = f"{APP_DIR}/../templates/l10n/{lang}.json"
         if lang not in SUPPORTED_LANGUAGES or not exists(file_path):
             raise NotFoundRequest("Language code not supported")
-        with open(file_path, "r") as f:
+        with open(file_path, "r", encoding="utf-8") as f:
             data = json.load(f)
-        with open(f"{APP_DIR}/../templates/attributes.json", "r") as f:
+        with open(
+            f"{APP_DIR}/../templates/attributes.json", "r", encoding="utf-8"
+        ) as f:
             attributes = json.load(f)
 
         t0 = time.time()

backend/manage_default_items.py

@@ -24,7 +24,7 @@ def loadLang(lang: str):
         default_items[lang] = {"items": {}}
         if os.path.exists(BASE_PATH + "/templates/l10n/" + lang + ".json"):
             with open(
-                BASE_PATH + "/templates/l10n/" + lang + ".json", "r", encoding="utf8"
+                BASE_PATH + "/templates/l10n/" + lang + ".json", "r", encoding="utf-8"
             ) as f:
                 default_items[lang] = json.loads(f.read())
 
@@ -79,15 +79,15 @@ def loadLang(lang: str):
 
     folder = BASE_PATH + "/templates/l10n/" if saveToTemplate else (EXPORT_FOLDER + "/")
     for key, content in default_items.items():
-        with open(folder + key + ".json", "w", encoding="utf8") as f:
+        with open(folder + key + ".json", "w", encoding="utf-8") as f:
             f.write(json.dumps(content, ensure_ascii=False, indent=2, sort_keys=True))
 
 
 def update_attributes(saveToTemplate: bool = False):
     # read files
-    with open(BASE_PATH + "/templates/l10n/en.json", encoding="utf8") as f:
+    with open(BASE_PATH + "/templates/l10n/en.json", encoding="utf-8") as f:
         en: dict = json.load(f)
-    with open(BASE_PATH + "/templates/attributes.json", encoding="utf8") as f:
+    with open(BASE_PATH + "/templates/attributes.json", encoding="utf-8") as f:
         attr: dict = json.load(f)
 
     unkownKeys = []
@@ -135,10 +135,10 @@ def update_attributes(saveToTemplate: bool = False):
 
     jsonContent = json.dumps(attr, ensure_ascii=False, indent=2, sort_keys=True)
     if saveToTemplate:
-        with open(BASE_PATH + "/templates/attributes.json", "w", encoding="utf8") as f:
+        with open(BASE_PATH + "/templates/attributes.json", "w", encoding="utf-8") as f:
             f.write(jsonContent)
     else:
-        with open(EXPORT_FOLDER + "/attributes.json", "w", encoding="utf8") as f:
+        with open(EXPORT_FOLDER + "/attributes.json", "w", encoding="utf-8") as f:
             f.write(jsonContent)