From eb2129e7f5d3278558b37791b557b08f87cf19c8 Mon Sep 17 00:00:00 2001
From: Philipp Wolfer <ph.wolfer@gmail.com>
Date: Mon, 17 Oct 2022 14:00:57 +0200
Subject: [PATCH] Ensure SPA HTML files get loaded with UTF-8 encoding
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Fixes issues with wrong encoding of the "Loading Funkwhale…" text in index.html
---
api/funkwhale_api/common/middleware.py | 1 +
changes/changelog.d/index-html-encoding.bugfix | 1 +
2 files changed, 2 insertions(+)
create mode 100644 changes/changelog.d/index-html-encoding.bugfix
diff --git a/api/funkwhale_api/common/middleware.py b/api/funkwhale_api/common/middleware.py
index cc897bf771..b8f313f700 100644
--- a/api/funkwhale_api/common/middleware.py
+++ b/api/funkwhale_api/common/middleware.py
@@ -130,6 +130,7 @@ def get_spa_file(spa_url, name):
utils.join_url(spa_url, name),
)
response.raise_for_status()
+ response.encoding = "utf-8"
content = response.text
caches["local"].set(cache_key, content, settings.FUNKWHALE_SPA_HTML_CACHE_DURATION)
return content
diff --git a/changes/changelog.d/index-html-encoding.bugfix b/changes/changelog.d/index-html-encoding.bugfix
new file mode 100644
index 0000000000..6f63d232fc
--- /dev/null
+++ b/changes/changelog.d/index-html-encoding.bugfix
@@ -0,0 +1 @@
+Ensure index.html files get loaded with UTF-8 encoding
\ No newline at end of file
--
GitLab