diff options
| author | Marco Rodolfi <marco.rodolfi@tuta.io> | 2023-05-04 17:46:00 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-05-04 16:46:00 +0100 |
| commit | 089e6b086c7b125ef077a9351f50c292c8cbd712 (patch) | |
| tree | 8d211e9911a1f612702570b662f5601a74ea3c4a | |
| parent | 08d5c942a46df926e18b807a11761e447465def9 (diff) | |
| download | decky-loader-089e6b086c7b125ef077a9351f50c292c8cbd712.tar.gz decky-loader-089e6b086c7b125ef077a9351f50c292c8cbd712.zip | |
Small fix: handle missing localization in backend plus a small typo in the english language (#443)v2.8.0-pre3
* Hotfix for i18n where the detector was overriding localStorage
* Please, pnpm, cooperate
* Small fix regarding the backend getting hammered when switching to not supported languages plus a small english typo
| -rw-r--r-- | backend/loader.py | 10 | ||||
| -rw-r--r-- | backend/locales/en-US.json | 2 | ||||
| -rw-r--r-- | frontend/pnpm-lock.yaml | 6 |
3 files changed, 11 insertions, 7 deletions
diff --git a/backend/loader.py b/backend/loader.py index 8c4c4a7f..d8b97bbd 100644 --- a/backend/loader.py +++ b/backend/loader.py @@ -101,9 +101,13 @@ class Loader: return web.FileResponse(file, headers={"Cache-Control": "no-cache"}) async def handle_frontend_locales(self, request): - file = path.join(path.dirname(__file__), "locales", request.match_info["path"]) - - return web.FileResponse(file, headers={"Cache-Control": "no-cache", "Content-Type": "application/json"}) + req_lang = request.match_info["path"] + file = path.join(path.dirname(__file__), "locales", req_lang) + if exists(file): + return web.FileResponse(file, headers={"Cache-Control": "no-cache", "Content-Type": "application/json"}) + else: + self.logger.info(f"Language {req_lang} not available, returning an empty dictionary") + return web.json_response(data={}, headers={"Cache-Control": "no-cache"}) async def get_plugins(self, request): plugins = list(self.plugins.values()) diff --git a/backend/locales/en-US.json b/backend/locales/en-US.json index 70a7a7ae..4abac003 100644 --- a/backend/locales/en-US.json +++ b/backend/locales/en-US.json @@ -171,7 +171,7 @@ "patch_notes_desc": "Patch Notes", "updates": { "check_button": "Check For Updates", - "checking": "'Checking", + "checking": "Checking", "cur_version": "Current version: {{ver}}", "install_button": "Install Update", "label": "Updates", diff --git a/frontend/pnpm-lock.yaml b/frontend/pnpm-lock.yaml index 6feb5c6b..2a6ff259 100644 --- a/frontend/pnpm-lock.yaml +++ b/frontend/pnpm-lock.yaml @@ -1099,7 +1099,7 @@ packages: hasBin: true dependencies: caniuse-lite: 1.0.30001482 - electron-to-chromium: 1.4.380 + electron-to-chromium: 1.4.382 node-releases: 2.0.10 update-browserslist-db: 1.0.11(browserslist@4.21.5) dev: true @@ -1494,8 +1494,8 @@ packages: stream-shift: 1.0.1 dev: true - /electron-to-chromium@1.4.380: - resolution: {integrity: sha512-XKGdI4pWM78eLH2cbXJHiBnWUwFSzZM7XujsB6stDiGu9AeSqziedP6amNLpJzE3i0rLTcfAwdCTs5ecP5yeSg==} + /electron-to-chromium@1.4.382: + resolution: {integrity: sha512-czMavlW52VIPgutbVL9JnZIZuFijzsG1ww/1z2Otu1r1q+9Qe2bTsH3My3sZarlvwyqHM6+mnZfEnt2Vr4dsIg==} dev: true /emoji-regex@8.0.0: |