From 0c981f214da1635b8ddf101eaff502cf33d90e81 Mon Sep 17 00:00:00 2001 From: Stefan Allius Date: Mon, 28 Apr 2025 20:45:19 +0200 Subject: [PATCH] - clean target erases the *.pot - don't modify the resurt of url_for() calls - don't translate the language description --- Makefile | 12 ++++++++++-- app/Makefile | 4 +++- app/src/web/i18n.py | 17 +++++++++-------- app/src/web/pages.py | 2 +- app/src/web/templates/base.html.j2 | 18 +++++++++--------- app/tests/test_web_route.py | 2 +- app/translations/de/LC_MESSAGES/messages.po | 14 +------------- 7 files changed, 34 insertions(+), 35 deletions(-) diff --git a/Makefile b/Makefile index a6549e2..b98463f 100644 --- a/Makefile +++ b/Makefile @@ -1,11 +1,19 @@ .PHONY: build babel clean addon-dev addon-debug addon-rc addon-rel debug dev preview rc rel check-docker-compose install -babel debug dev preview rc rel: +babel: $(MAKE) -C app $@ -clean build: +build: $(MAKE) -C ha_addons $@ +clean build: + $(MAKE) -C app $@ + $(MAKE) -C ha_addons $@ + +debug dev preview rc rel: + $(MAKE) -C app babel + $(MAKE) -C app $@ + addon-dev addon-debug addon-rc addon-rel: $(MAKE) -C app babel $(MAKE) -C ha_addons $(patsubst addon-%,%,$@) diff --git a/app/Makefile b/app/Makefile index 6db4b6e..29be248 100644 --- a/app/Makefile +++ b/app/Makefile @@ -21,6 +21,8 @@ export MAJOR := $(shell echo $(VERSION) | cut -f1 -d.) PUBLIC_URL := $(shell echo $(PUBLIC_CONTAINER_REGISTRY) | cut -f1 -d/) PUBLIC_USER :=$(shell echo $(PUBLIC_CONTAINER_REGISTRY) | cut -f2 -d/) +clean: + rm -f $(BABEL_TRANSLATIONS)/*.pot dev debug: @echo version: $(VERSION) build-date: $(BUILD_DATE) image: $(PRIVAT_CONTAINER_REGISTRY)$(IMAGE) @@ -58,4 +60,4 @@ $(BABEL_TRANSLATIONS)/%/LC_MESSAGES/messages.po : $(BABEL_TRANSLATIONS)/messages $(BABEL_TRANSLATIONS)/%/LC_MESSAGES/messages.mo : $(BABEL_TRANSLATIONS)/%/LC_MESSAGES/messages.po @pybabel compile -d $(BABEL_TRANSLATIONS) -l $* -.PHONY: babel debug dev preview rc rel +.PHONY: babel clean debug dev preview rc rel diff --git a/app/src/web/i18n.py b/app/src/web/i18n.py index 918e6b8..007c592 100644 --- a/app/src/web/i18n.py +++ b/app/src/web/i18n.py @@ -1,13 +1,12 @@ -from quart import request, session, redirect, abort -from quart_babel import _ +from quart import request, session, redirect, abort, url_for from quart_babel.locale import get_locale as babel_get_locale from . import web LANGUAGES = { - 'en': _('English'), - 'de': _('German'), - 'fr': _('French') + 'en': 'English', + 'de': 'Deutsch', + 'fr': 'Français' } @@ -36,8 +35,10 @@ def utility_processor(): @web.route('/language/') -def set_language(language=None): +async def set_language(language=None): if language in LANGUAGES: session['language'] = language - return redirect(request.referrer) - return abort(400) + if request.referrer is not None: + return redirect(request.referrer) + return redirect(url_for('web.index')) + return abort(404) diff --git a/app/src/web/pages.py b/app/src/web/pages.py index f9319c6..cc1e706 100644 --- a/app/src/web/pages.py +++ b/app/src/web/pages.py @@ -7,7 +7,7 @@ from . import web async def index(): return await render_template( 'index.html.j2', - fetch_url='.'+url_for('web.data_fetch')) + fetch_url=url_for('web.data_fetch')) @web.route('/page') diff --git a/app/src/web/templates/base.html.j2 b/app/src/web/templates/base.html.j2 index 5a3f245..d1cf711 100644 --- a/app/src/web/templates/base.html.j2 +++ b/app/src/web/templates/base.html.j2 @@ -4,8 +4,8 @@ {% block title %}{% endblock title %} - - + + @@ -14,7 +14,7 @@ @@ -25,10 +25,10 @@
- +
{% for language in languages %} - {{_(languages[language])}} + {{languages[language]}} {% endfor %}
@@ -43,7 +43,7 @@ diff --git a/app/tests/test_web_route.py b/app/tests/test_web_route.py index d0a3d35..ff721ed 100644 --- a/app/tests/test_web_route.py +++ b/app/tests/test_web_route.py @@ -153,5 +153,5 @@ async def test_language_de(client): async def test_language_unknown(client): """Test the language/en route.""" response = await client.get('/language/unknonw') - assert response.status_code == 400 + assert response.status_code == 404 assert response.mimetype == 'text/html' diff --git a/app/translations/de/LC_MESSAGES/messages.po b/app/translations/de/LC_MESSAGES/messages.po index f2b4b97..0c49d7f 100644 --- a/app/translations/de/LC_MESSAGES/messages.po +++ b/app/translations/de/LC_MESSAGES/messages.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: tsun-gen3-proxy 0.14.0\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2025-04-27 01:25+0200\n" +"POT-Creation-Date: 2025-04-28 20:37+0200\n" "PO-Revision-Date: 2025-04-18 16:24+0200\n" "Last-Translator: FULL NAME \n" "Language: de\n" @@ -19,18 +19,6 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Generated-By: Babel 2.17.0\n" -#: src/web/i18n.py:7 -msgid "English" -msgstr "Englisch" - -#: src/web/i18n.py:8 -msgid "German" -msgstr "Deutsch" - -#: src/web/i18n.py:9 -msgid "French" -msgstr "Französisch" - #: src/web/templates/base.html.j2:37 msgid "Updated:" msgstr "Aktualisiert:"