feat/flask: simplified header structure/locales/routing

2025-06-05 09:27:42 +03:00
parent 03ff66718f
commit 3c6e21b4e8
10 changed files with 12 additions and 19 deletions
--- a/app.py
+++ b/app.py
@@ -86,7 +86,7 @@ def index(lang):


@app.route("/<lang>/download")
-def download_page(lang):
+def download(lang):

    if lang not in locales_dict:
        abort(404)
--- a/locales/de.ini
+++ b/locales/de.ini
@@ -1,12 +1,11 @@
 [title]
 language = Deutsch
 index = KolibriOS
-download_page = KolibriOS - Herunterladen
+download = KolibriOS - Herunterladen

 [header]
 index = KolibriOS offizielle seite
 download = KolibriOS Herunterladen
-description = KolibriOS offizielle seite

 [menu]
 kolibrios = KolibriOS
--- a/locales/en.ini
+++ b/locales/en.ini
@@ -1,12 +1,11 @@
 [title]
 language = English
 index = KolibriOS
-download_page = KolibriOS - Download
+download = KolibriOS - Download

 [header]
 index = KolibriOS official site
 download = KolibriOS downloads
-description = KolibriOS official site

 [menu]
 kolibrios = KolibriOS
--- a/locales/es.ini
+++ b/locales/es.ini
@@ -1,12 +1,11 @@
 [title]
 language = Spanish
 index = KolibriOS
-download_page = KolibriOS - Descargar
+download = KolibriOS - Descargar

 [header]
 index = Sitio oficial de KolibriOS
 download = KolibriOS Descargar
-description = Sitio oficial de KolibriOS

 [menu]
 kolibrios = KolibriOS
--- a/locales/fr.ini
+++ b/locales/fr.ini
@@ -1,12 +1,11 @@
 [title]
 language = Français
 index = KolibriOS
-download_page = KolibriOS - Télécharger
+download = KolibriOS - Télécharger

 [header]
 index = Site officiel de KolibriOS
 download = KolibriOS Téléchargements
-description = Site officiel de KolibriOS

 [menu]
 kolibrios = KolibriOS
--- a/locales/it.ini
+++ b/locales/it.ini
@@ -1,12 +1,11 @@
 [title]
 language = Italiano
 index = KolibriOS
-download_page = KolibriOS - Scaricare
+download = KolibriOS - Scaricare

 [header]
 index = Sito ufficiale KolibriOS
 download = KolibriOS Scaricamento
-description = Sito ufficiale KolibriOS

 [menu]
 kolibrios = KolibriOS
--- a/locales/nl.ini
+++ b/locales/nl.ini
@@ -1,12 +1,11 @@
 [title]
 language = Nederlands
 index = KolibriOS
-download_page = KolibriOS - Downloaden
+download = KolibriOS - Downloaden

 [header]
 index = KolibriOS officiële site
 download = KolibriOS Downloads
-description = KolibriOS officiële site

 [menu]
 kolibrios = KolibriOS
--- a/locales/ru.ini
+++ b/locales/ru.ini
@@ -1,12 +1,11 @@
 [title]
 language = Русский
 index = КолибриОС
-download_page = КолибриОС - Скачать
+download = КолибриОС - Скачать

 [header]
 index = Официальный сайт KolibriOS
 download = Скачать КолибриОС
-description = Официальный сайт KolibriOS

 [menu]
 kolibrios = КолибриОС
--- a/templates/tmpl/_header.htm
+++ b/templates/tmpl/_header.htm
@@ -1,8 +1,8 @@
 <head>
    <meta charset="utf-8">
-    <title>{{ locale['header'][request.url_rule.endpoint] }}</title>
+    <title>{{ locale['title'][request.url_rule.endpoint] }}</title>
    <link rel="icon" type="image/x-icon" href="{{ url_for('static', filename='favicon.ico') }}">
-    <meta name="description" content="{{ locale['header']['description'] }}">
+    <meta name="description" content="{{ locale['header'][request.url_rule.endpoint] }}">
    <meta name="keywords"
        content="kolibri, kolibrios, колибри, колибриос, colibri, operating system, assembler, калибри, fasm, alternate, open source">
    <meta name="viewport" content="width=device-width">
--- a/templates/tmpl/_menu.htm
+++ b/templates/tmpl/_menu.htm
@@ -7,8 +7,8 @@
        {% endif %}
    </a>
    
-    <a href="{{ url_for('download_page', lang=lang) }}" class="{% if current == 'download_page' %}a-sel{% endif %}">
-        {% if current == 'download_page' %}
+    <a href="{{ url_for('download', lang=lang) }}" class="{% if current == 'download' %}a-sel{% endif %}">
+        {% if current == 'download' %}
            <font bg="lightblue">{{ locale['menu']['download'] }}</font>
        {% else %}
            {{ locale['menu']['download'] }}