From 42a43ff0d1d338e4b8a8d81b9a67fa925abaea25 Mon Sep 17 00:00:00 2001
From: Alexander Borsuk <me@alex.bio>
Date: Tue, 3 Nov 2026 18:56:24 +0100
Subject: [PATCH 01/10] Fix language declarations in navigation and donation
 fallbacks

Declare fallback menu labels and checkout text in their source language while
retaining the donation page language for payment return URLs. Resolve donation
companions directly in the active language with a strict default-language
fallback, and use full resources' root-relative paths for internal links.

Exercise the real checkout form with translated companions and slugs, missing
default resources, inherited menu, heading and form languages, and an independent
payment language. Document the lookup rules and regression command.

Signed-off-by: Alexander Borsuk <me@alex.bio>
---
 .github/copilot-instructions.md |   5 +-
 templates/_donate_form.html     |   2 +-
 templates/donate-subscribe.html |   7 +-
 templates/donate.html           |   9 +-
 templates/top_menu.html         |   2 +-
 tools/test_navigation.py        | 147 ++++++++++++++++++++++----------
 6 files changed, 116 insertions(+), 56 deletions(-)

diff --git a/.github/copilot-instructions.md b/.github/copilot-instructions.md
index d74aa776d..c1dbf2c37 100644
--- a/.github/copilot-instructions.md
+++ b/.github/copilot-instructions.md
@@ -76,6 +76,7 @@ Use `{{ trans(key='faq-menu-title', lang=lang) }}` to get localized strings from
 zola serve           # Live preview at http://127.0.0.1:1111
 zola build           # Generate static site in public/
 npm test             # Offline translation, hook and Telegram regressions
+python3 tools/test_navigation.py # Navigation and donation language fallbacks (requires Zola)
 npm run test:browser # Donation checkout regressions against public/ (build first)
 npm run format       # Format MD + SCSS (stylelint + prettier + js-beautify)
 npm run upgrade      # Update npm dependencies
@@ -167,7 +168,9 @@ hook, the test suite — adds `tools/` to `sys.path` explicitly.
 
 - Top menu built dynamically in `templates/top_menu.html`
 - Reads pages via `get_section()` and `get_page()`
-- Finds translations via `[t for t in page.translations if t.lang == lang] | first` because Tera v2 has no `filter` filter
+- The top menu looks up each destination with `lang=lang, allow_missing=true`, then strictly loads the default-language resource if its translation is absent. Missing required default resources stop the build.
+- The bottom menu selects translations from the default-language inventory via `[t for t in page.translations if t.lang == lang] | first` because Tera v2 has no `filter` filter.
+- Top-menu fallback links and donation checkout text declare the selected resource's language so assistive technology can pronounce them correctly. The checkout API still receives the donation page's language for its return URLs.
 - Menu titles from `extra.menu_title` in content frontmatter
 
 ### Styling
diff --git a/templates/_donate_form.html b/templates/_donate_form.html
index 3471fa3f3..689d139a2 100644
--- a/templates/_donate_form.html
+++ b/templates/_donate_form.html
@@ -97,5 +97,5 @@
           data-label-once="{{ f.submit_once }}" data-label-month="{{ f.submit_month }}"
           data-label-year="{{ f.submit_year }}" data-label-loading="{{ f.submit_loading }}">{{ f.submit }}</button>
   <p class="donate-secure-note">{{ f.secure_note }}</p>
-  <p class="donate-alt"><a href="{{ donate.permalink | replace(from=config.base_url, to="") | safe }}#other-ways">{{ f.other_ways }}</a></p>
+  <p class="donate-alt"><a href="{{ donate.path | safe }}#other-ways">{{ f.other_ways }}</a></p>
 </form>
diff --git a/templates/donate-subscribe.html b/templates/donate-subscribe.html
index aa73f177e..9232fd4a2 100644
--- a/templates/donate-subscribe.html
+++ b/templates/donate-subscribe.html
@@ -10,9 +10,10 @@
 {% block content %}
 {% set f = resource.extra.form %}
 {# The main donation page may be untranslated even when this landing page exists. #}
-{% set donate = get_page(path="donate/index.md", lang=config.default_language) %}
-{% set translated = [t for t in donate.translations if t.lang == lang] | first %}
-{% if translated %}{% set donate = translated %}{% endif %}
+{% set donate = get_page(path="donate/index.md", lang=lang, allow_missing=true) %}
+{% if not donate %}
+  {% set donate = get_page(path="donate/index.md", lang=config.default_language) %}
+{% endif %}
 {% set return_to = "subscribe" %}
 <section class="donate-form-page donate-focused-page">
   <h1>{{ resource.title }}</h1>
diff --git a/templates/donate.html b/templates/donate.html
index 4d216600c..407ec59b2 100644
--- a/templates/donate.html
+++ b/templates/donate.html
@@ -1,9 +1,10 @@
 {% extends 'base.html' %}
 
 {% block content %}
-{% set subscribe = get_page(path="donate/subscribe/index.md", lang=config.default_language) %}
-{% set translated = [t for t in subscribe.translations if t.lang == lang] | first %}
-{% if translated %}{% set subscribe = get_page(path=translated.path) %}{% endif %}
+{% set subscribe = get_page(path="donate/subscribe/index.md", lang=lang, allow_missing=true) %}
+{% if not subscribe %}
+  {% set subscribe = get_page(path="donate/subscribe/index.md", lang=config.default_language) %}
+{% endif %}
 {% set f = subscribe.extra.form %}
 {% set donate = resource %}
 {% set return_to = "donate" %}
@@ -19,7 +20,7 @@
       <h1 id="donate-title">{{ resource.title }}</h1>
       {{ story | first | safe }}
     </div>
-    <section id="donation" class="donate-card" aria-labelledby="donate-card-title">
+    <section id="donation" lang="{{ subscribe.lang }}" class="donate-card" aria-labelledby="donate-card-title">
       <h2 id="donate-card-title">{{ f.form_title }}</h2>
       {% include '_donate_form.html' %}
     </section>
diff --git a/templates/top_menu.html b/templates/top_menu.html
index ab028d022..5ac34688b 100644
--- a/templates/top_menu.html
+++ b/templates/top_menu.html
@@ -18,7 +18,7 @@
       {% endif %}
     {% endif %}
     <span class="top_menu_{{ page.path | split(pat="/") | reverse | nth(n=1) }} top_menu_item{% if page.path != resource_path %}">
-      <a href="{{ page.permalink | replace(from=config.base_url, to="") | safe }}">{% else %}_active">{% endif %}
+      <a lang="{{ page.lang }}" href="{{ page.path | safe }}">{% else %}_active">{% endif %}
         <span>{{ page.extra.menu_title }}</span>
         {%- if page.path != resource_path %}</a>{% endif %}
     </span>
diff --git a/tools/test_navigation.py b/tools/test_navigation.py
index b4daab403..b8623e919 100644
--- a/tools/test_navigation.py
+++ b/tools/test_navigation.py
@@ -1,6 +1,7 @@
 #!/usr/bin/env python3
 """Build small multilingual sites to test navigation with the real Zola templates."""
 
+import re
 import shutil
 import subprocess
 import tempfile
@@ -15,6 +16,9 @@
     "contribute/index.md": ("Contribute", "Mitmachen"),
     "faq/_index.md": ("Help", "Hilfe"),
 }
+CONFIG = ('base_url = "https://example.org"\n'
+          '[languages.de]\n[translations]\nlanguage = "English"\n'
+          '[languages.de.translations]\nlanguage = "Deutsch"\n')
 
 
 def write(root, path, text):
@@ -23,21 +27,39 @@ def write(root, path, text):
     target.write_text(text, encoding="utf-8")
 
 
-class MenuLinks(HTMLParser):
+class RenderedPage(HTMLParser):
+    VOID_TAGS = {"area", "base", "br", "col", "embed", "hr", "img", "input",
+                 "link", "meta", "param", "source", "track", "wbr"}
+
     def __init__(self):
         super().__init__()
+        self.stack = []
         self.in_menu = False
         self.href = None
+        self.link_language = None
         self.label = []
         self.links = []
+        self.form_language = None
+        self.heading_language = None
+        self.checkout_language = None
 
     def handle_starttag(self, tag, attrs):
         attrs = dict(attrs)
+        language = attrs.get("lang", self.stack[-1][1] if self.stack else None)
         if tag == "nav":
             self.in_menu = attrs.get("id") == "menu"
         if tag == "a" and self.in_menu:
             self.href = attrs["href"]
+            self.link_language = language
             self.label = []
+        if attrs.get("id") == "donate-form":
+            self.form_language = language
+        if attrs.get("id") == "donate-card-title":
+            self.heading_language = language
+        if tag == "input" and attrs.get("name") == "lang":
+            self.checkout_language = attrs["value"]
+        if tag not in self.VOID_TAGS:
+            self.stack.append((tag, language))
 
     def handle_data(self, data):
         if self.href is not None:
@@ -45,10 +67,14 @@ def handle_data(self, data):
 
     def handle_endtag(self, tag):
         if tag == "a" and self.href is not None:
-            self.links.append((self.href, "".join(self.label).strip()))
+            self.links.append((self.href, "".join(self.label).strip(), self.link_language))
             self.href = None
         if tag == "nav":
             self.in_menu = False
+        for index in range(len(self.stack) - 1, -1, -1):
+            if self.stack[index][0] == tag:
+                del self.stack[index:]
+                break
 
 
 class NavigationTests(unittest.TestCase):
@@ -56,10 +82,28 @@ def setUp(self):
         self.zola = shutil.which("zola")
         self.assertIsNotNone(self.zola, "Install Zola to run navigation tests")
 
-    def build(self, root):
+    def build(self, root, *, expected_error=None):
         result = subprocess.run([self.zola, "build"], cwd=root,
                                 capture_output=True, text=True)
-        self.assertEqual(result.returncode, 0, result.stdout + result.stderr)
+        output = result.stdout + result.stderr
+        if expected_error is None:
+            self.assertEqual(result.returncode, 0, output)
+        else:
+            self.assertNotEqual(result.returncode, 0, output)
+            self.assertIn(expected_error, output)
+
+    def navigation_site(self, root):
+        write(root, "config.toml", CONFIG)
+        menu = ('<html lang="{{ lang }}">{% set resource = section %}'
+                '{% set resource_path = section.path %}'
+                '{% include "top_menu.html" %}</html>')
+        write(root, "templates/index.html", menu)
+        write(root, "templates/section.html", menu)
+        write(root, "templates/page.html", "{{ page.title }}")
+        for template in ("top_menu.html", "language_selector.html"):
+            write(root, f"templates/{template}", (ROOT / "templates" / template).read_text())
+        for suffix, title in (("", "Home"), (".de", "Start")):
+            write(root, f"content/_index{suffix}.md", f"---\ntitle: {title}\n---\n")
 
     def test_missing_translations_use_default_language_destinations(self):
         # Each lookup must work when its own translation is absent, while the
@@ -72,71 +116,82 @@ def test_missing_translations_use_default_language_destinations(self):
                 def content(path, title):
                     write(root, path, f"---\ntitle: {title}\nextra:\n  menu_title: {title}\n---\n")
 
-                write(root, "config.toml", 'base_url = "https://example.org"\n'
-                      '[languages.de]\n[translations]\nlanguage = "English"\n'
-                      '[languages.de.translations]\nlanguage = "Deutsch"\n')
-                menu = ('{% set resource = section %}'
-                        '{% set resource_path = section.path %}'
-                        '{% include "top_menu.html" %}')
-                write(root, "templates/index.html", menu)
-                write(root, "templates/section.html", menu)
-                write(root, "templates/page.html", "{{ page.title }}")
-                for template in ("top_menu.html", "language_selector.html"):
-                    write(root, f"templates/{template}", (ROOT / "templates" / template).read_text())
-                content("content/_index.md", "Home")
-                content("content/_index.de.md", "Start")
-                expected = [("/de/", "")]
+                self.navigation_site(root)
+                expected = [("/de/", "", "de")]
                 for path, (english, german) in DESTINATIONS.items():
                     content(f"content/{path}", english)
                     if path not in missing:
                         content(f"content/{path[:-3]}.de.md", german)
                     prefix = "" if path in missing else "/de"
                     expected.append((f"{prefix}/{path.split('/')[0]}/",
-                                     english if path in missing else german))
+                                     english if path in missing else german,
+                                     "en" if path in missing else "de"))
 
                 self.build(root)
-                parser = MenuLinks()
+                parser = RenderedPage()
                 parser.feed((root / "public/de/index.html").read_text())
                 self.assertEqual(parser.links[:5], expected)
-                for href, _ in expected:
+                for href, _, _ in expected:
                     self.assertTrue((root / "public" / href.strip("/") / "index.html").is_file(), href)
 
-    def test_donation_pages_use_default_language_companions(self):
-        for translated in ("donate/index.md", "donate/subscribe/index.md"):
-            with self.subTest(translated=translated), tempfile.TemporaryDirectory() as tmp:
+    def test_missing_default_destinations_stop_the_build(self):
+        for missing, kind in (("news/_index.md", "Section"), ("donate/index.md", "Page")):
+            with self.subTest(missing=missing), tempfile.TemporaryDirectory() as tmp:
+                root = Path(tmp)
+                self.navigation_site(root)
+                for path, (english, german) in DESTINATIONS.items():
+                    if path != missing:
+                        write(root, f"content/{path}",
+                              f"---\ntitle: {english}\nextra:\n  menu_title: {english}\n---\n")
+                    write(root, f"content/{path[:-3]}.de.md",
+                          f"---\ntitle: {german}\nextra:\n  menu_title: {german}\n---\n")
+                self.build(root, expected_error=f"{kind} `{missing}` not found.")
+
+    def test_donation_pages_select_companions_and_form_language(self):
+        for missing in ((), ("donate/index.md",), ("donate/subscribe/index.md",)):
+            with self.subTest(missing=missing), tempfile.TemporaryDirectory() as tmp:
                 root = Path(tmp)
-                write(root, "config.toml", 'base_url = "https://example.org"\n'
-                      '[languages.de]\n[translations]\nlanguage = "English"\n'
-                      '[languages.de.translations]\nlanguage = "Deutsch"\n')
-                write(root, "templates/base.html", '{% set resource = page %}'
-                      '{% block header %}{% endblock %}{% block content %}{% endblock %}')
-                # Expose the form's selected resources without unrelated checkout fields.
-                write(root, "templates/_donate_form.html",
-                      '<a href="{{ donate.permalink | replace(from=config.base_url, to=\"\") | safe }}#other-ways">'
-                      '{{ f.form_title }}</a>')
+                write(root, "config.toml", CONFIG)
+                write(root, "templates/base.html", '<html lang="{{ lang }}">{% set resource = page %}'
+                      '{% block header %}{% endblock %}{% block content %}{% endblock %}</html>')
                 write(root, "static/js/donate-subscribe.js", "")
-                for template in ("donate.html", "donate-subscribe.html", "language_selector.html"):
+                for template in ("donate.html", "donate-subscribe.html", "_donate_form.html", "language_selector.html"):
                     write(root, f"templates/{template}", (ROOT / "templates" / template).read_text())
                 donate = ('---\ntitle: Donate\ntemplate: donate.html\n---\n'
                           'Intro\n\n<!-- donation-impact -->\n\nImpact\n\n'
                           '<!-- donation-methods -->\n\nMethods\n')
-                subscribe = ('---\ntitle: Support\ntemplate: donate-subscribe.html\n'
-                             'extra:\n  form:\n    form_title: Default checkout\n---\n')
+                # Keep every field required by the real checkout, varying only the labels under test.
+                subscribe = (ROOT / "content/donate/subscribe/index.md").read_text()
+                subscribe = re.sub(r"(?m)^    form_title:.*$", "    form_title: Default checkout", subscribe)
+                subscribe = re.sub(r"(?m)^    other_ways:.*$", "    other_ways: Default alternatives", subscribe)
                 write(root, "content/donate/index.md", donate)
                 write(root, "content/donate/subscribe/index.md", subscribe)
-                if translated == "donate/index.md":
-                    write(root, "content/donate/index.de.md", donate)
-                    expected_path, expected_label = "/de/donate/", "Default checkout"
-                else:
+                if "donate/index.md" not in missing:
+                    write(root, "content/donate/index.de.md",
+                          donate.replace("title: Donate", "title: Spenden\nslug: spenden"))
+                if "donate/subscribe/index.md" not in missing:
                     write(root, "content/donate/subscribe/index.de.md",
-                          subscribe.replace("Default checkout", "Localized checkout"))
-                    expected_path, expected_label = "/donate/", "Localized checkout"
+                          subscribe.replace("Default", "Localized"))
 
                 self.build(root)
-                output = root / "public/de" / translated.replace(".md", ".html")
-                self.assertIn(f'href="{expected_path}#other-ways">{expected_label}</a>',
-                              output.read_text())
-                self.assertTrue((root / "public" / expected_path.strip("/") / "index.html").is_file())
+                expected_path = "/donate/" if "donate/index.md" in missing else "/de/spenden/"
+                for page in ("donate/index.md", "donate/subscribe/index.md"):
+                    if page in missing:
+                        continue
+                    with self.subTest(page=page):
+                        path = "/de/spenden/" if page == "donate/index.md" else "/de/donate/subscribe/"
+                        output = (root / "public" / path.strip("/") / "index.html").read_text()
+                        label = "Default" if "donate/subscribe/index.md" in missing else "Localized"
+                        self.assertIn(f'href="{expected_path}#other-ways">{label} alternatives</a>', output)
+                        if page == "donate/index.md":
+                            self.assertIn(f'>{label} checkout</h2>', output)
+                        parser = RenderedPage()
+                        parser.feed(output)
+                        self.assertEqual(parser.form_language, "en" if label == "Default" else "de")
+                        if page == "donate/index.md":
+                            self.assertEqual(parser.heading_language, "en" if label == "Default" else "de")
+                        self.assertEqual(parser.checkout_language, "de")
+                        self.assertTrue((root / "public" / expected_path.strip("/") / "index.html").is_file())
 
 
 if __name__ == "__main__":

From 325f75347dfc6312a0cc8a3401899414609abc5a Mon Sep 17 00:00:00 2001
From: Alexander Borsuk <me@alex.bio>
Date: Wed, 4 Nov 2026 01:40:16 +0100
Subject: [PATCH 02/10] Keep donation checkout direction independent of the
 page

Detect direction from the checkout labels so an English fallback stays left-to-right inside an RTL document. Cover the rendered English card in an Arabic page and preserve the native Arabic form direction.

Signed-off-by: Alexander Borsuk <me@alex.bio>
---
 .github/copilot-instructions.md |  2 ++
 templates/donate.html           |  3 ++-
 tools/donate_browser.test.cjs   | 17 +++++++++++++++++
 3 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/.github/copilot-instructions.md b/.github/copilot-instructions.md
index c1dbf2c37..d500e765e 100644
--- a/.github/copilot-instructions.md
+++ b/.github/copilot-instructions.md
@@ -63,6 +63,8 @@ page's `extra.form`. The main page's Markdown contains `<!-- donation-impact -->
 and `<!-- donation-methods -->` exactly once, in that order; its template rejects
 missing, duplicate or reordered markers. JavaScript enables currency selection
 and scales presets together; without it, the form submits EUR consistently.
+The checkout card detects direction from its own labels so an English fallback
+stays left-to-right inside a right-to-left page.
 
 ### Translation Function
 
diff --git a/templates/donate.html b/templates/donate.html
index 407ec59b2..13f979217 100644
--- a/templates/donate.html
+++ b/templates/donate.html
@@ -20,7 +20,8 @@
       <h1 id="donate-title">{{ resource.title }}</h1>
       {{ story | first | safe }}
     </div>
-    <section id="donation" lang="{{ subscribe.lang }}" class="donate-card" aria-labelledby="donate-card-title">
+    {# Checkout labels can use a different writing direction from the surrounding page. #}
+    <section id="donation" lang="{{ subscribe.lang }}" dir="auto" class="donate-card" aria-labelledby="donate-card-title">
       <h2 id="donate-card-title">{{ f.form_title }}</h2>
       {% include '_donate_form.html' %}
     </section>
diff --git a/tools/donate_browser.test.cjs b/tools/donate_browser.test.cjs
index 32d3e8e57..10e78a550 100644
--- a/tools/donate_browser.test.cjs
+++ b/tools/donate_browser.test.cjs
@@ -205,6 +205,23 @@ test('declared main-page CSP permits payment forms and includes Mollie redirect
   assert.deepEqual(posted.map(p => p.host), ['donate-api.organicmaps.app', 'www.paypal.com']);
 });
 
+test('English checkout keeps its text direction inside an Arabic page', { timeout: 30000 }, async t => {
+  const { page } = await openPage(t, { javaScriptEnabled: false });
+  await page.goto(origin + '/ar/donate/');
+  const direction = selector => page.locator(selector).evaluate(e => getComputedStyle(e).direction);
+  assert.equal(await direction('#donate-form'), 'rtl');
+
+  // Use the rendered English card to exercise fallback labels inside an RTL document.
+  await page.evaluate(html => {
+    const english = new DOMParser().parseFromString(html, 'text/html');
+    document.getElementById('donation').replaceWith(english.getElementById('donation'));
+  }, fs.readFileSync(path.join(output, 'donate/index.html'), 'utf8'));
+  assert.equal(await page.locator('html').getAttribute('dir'), 'rtl');
+  assert.equal(await page.locator('#donate-form').evaluate(form => form.closest('[lang]').lang), 'en');
+  assert.equal(await direction('#donate-form'), 'ltr');
+  assert.equal(await direction('#amount-custom'), 'ltr');
+});
+
 test('the real donation template rejects missing, duplicate and reordered layout markers', { timeout: 30000 }, () => {
   const fixture = fs.mkdtempSync(path.join(os.tmpdir(), 'donate-markers-'));
   try {

From 627c3032065b00ba0d5c7da9ab1cb2bf88ce6b67 Mon Sep 17 00:00:00 2001
From: Alexander Borsuk <me@alex.bio>
Date: Wed, 4 Nov 2026 01:41:07 +0100
Subject: [PATCH 03/10] Declare languages for footer labels and language names

Mark fallback footer labels and both language-selector branches with the language of their text. Exercise mixed footer translations and both selector sources in rendered multilingual fixtures.

Signed-off-by: Alexander Borsuk <me@alex.bio>
---
 .github/copilot-instructions.md  |  2 +-
 templates/bottom_menu.html       |  4 ++--
 templates/language_selector.html |  4 ++--
 tools/test_navigation.py         | 36 ++++++++++++++++++++++++++------
 4 files changed, 35 insertions(+), 11 deletions(-)

diff --git a/.github/copilot-instructions.md b/.github/copilot-instructions.md
index d500e765e..e58d58ac4 100644
--- a/.github/copilot-instructions.md
+++ b/.github/copilot-instructions.md
@@ -172,7 +172,7 @@ hook, the test suite — adds `tools/` to `sys.path` explicitly.
 - Reads pages via `get_section()` and `get_page()`
 - The top menu looks up each destination with `lang=lang, allow_missing=true`, then strictly loads the default-language resource if its translation is absent. Missing required default resources stop the build.
 - The bottom menu selects translations from the default-language inventory via `[t for t in page.translations if t.lang == lang] | first` because Tera v2 has no `filter` filter.
-- Top-menu fallback links and donation checkout text declare the selected resource's language so assistive technology can pronounce them correctly. The checkout API still receives the donation page's language for its return URLs.
+- Menu labels, language-selector names and donation checkout text declare their own language so assistive technology can pronounce them correctly. The checkout API still receives the donation page's language for its return URLs.
 - Menu titles from `extra.menu_title` in content frontmatter
 
 ### Styling
diff --git a/templates/bottom_menu.html b/templates/bottom_menu.html
index bea2e4077..dccb0da4d 100644
--- a/templates/bottom_menu.html
+++ b/templates/bottom_menu.html
@@ -13,7 +13,7 @@
   {% endif %}
 
   {% if page.extra.menu_title %}
-  {% if resource_path != page.path %}<a href="{{ page.permalink | replace(from=config.base_url, to="") | safe }}">{% endif %}
+  {% if resource_path != page.path %}<a lang="{{ page.lang }}" href="{{ page.permalink | replace(from=config.base_url, to="") | safe }}">{% endif %}
     <span>{{ page.extra.menu_title }}</span>
     {%- if resource_path != page.path %}</a>{% endif %}
   &nbsp;
@@ -23,4 +23,4 @@
   <a href="https://omaps.app/api" title="How to open Organic Maps from other apps and pass the data back">API</a>
   &nbsp;
   <a href="mailto:hello@organicmaps.app">{{ trans(key='contact', lang=lang) }}</a>
-</nav>
\ No newline at end of file
+</nav>
diff --git a/templates/language_selector.html b/templates/language_selector.html
index 934bf9334..4a74442a7 100644
--- a/templates/language_selector.html
+++ b/templates/language_selector.html
@@ -19,7 +19,7 @@
     {% for translation in translations | sort(attribute="lang") %}
     {% if lang != translation.lang %}
     <li class="lang-menu-item" role="menuitem">
-      <a class="lang-menu-link" onclick="return onLanguageClick('{{ translation.lang }}');" href="{{ translation.permalink | replace(from=config.base_url, to="") | safe }}">
+      <a lang="{{ translation.lang }}" class="lang-menu-link" onclick="return onLanguageClick('{{ translation.lang }}');" href="{{ translation.permalink | replace(from=config.base_url, to="") | safe }}">
         {{ trans(key="language", lang=translation.lang) }}
       </a>
     </li>
@@ -29,7 +29,7 @@
     {%- for i in range(end=term_translation_langs | length) -%}
     {%- if term_translation_langs[i] != lang %}
     <li class="lang-menu-item" role="menuitem">
-      <a class="lang-menu-link" onclick="return onLanguageClick('{{ term_translation_langs[i] }}');" href="{{ term_translation_urls[i] | replace(from=config.base_url, to="") | safe }}">
+      <a lang="{{ term_translation_langs[i] }}" class="lang-menu-link" onclick="return onLanguageClick('{{ term_translation_langs[i] }}');" href="{{ term_translation_urls[i] | replace(from=config.base_url, to="") | safe }}">
         {{ trans(key="language", lang=term_translation_langs[i]) }}
       </a>
     </li>
diff --git a/tools/test_navigation.py b/tools/test_navigation.py
index b8623e919..03d66fb52 100644
--- a/tools/test_navigation.py
+++ b/tools/test_navigation.py
@@ -17,8 +17,8 @@
     "faq/_index.md": ("Help", "Hilfe"),
 }
 CONFIG = ('base_url = "https://example.org"\n'
-          '[languages.de]\n[translations]\nlanguage = "English"\n'
-          '[languages.de.translations]\nlanguage = "Deutsch"\n')
+          '[languages.de]\n[translations]\nlanguage = "English"\ncontact = "Contact"\n'
+          '[languages.de.translations]\nlanguage = "Deutsch"\ncontact = "Kontakt"\n')
 
 
 def write(root, path, text):
@@ -31,9 +31,10 @@ class RenderedPage(HTMLParser):
     VOID_TAGS = {"area", "base", "br", "col", "embed", "hr", "img", "input",
                  "link", "meta", "param", "source", "track", "wbr"}
 
-    def __init__(self):
+    def __init__(self, menu_id="menu"):
         super().__init__()
         self.stack = []
+        self.menu_id = menu_id
         self.in_menu = False
         self.href = None
         self.link_language = None
@@ -47,7 +48,7 @@ def handle_starttag(self, tag, attrs):
         attrs = dict(attrs)
         language = attrs.get("lang", self.stack[-1][1] if self.stack else None)
         if tag == "nav":
-            self.in_menu = attrs.get("id") == "menu"
+            self.in_menu = attrs.get("id") == self.menu_id
         if tag == "a" and self.in_menu:
             self.href = attrs["href"]
             self.link_language = language
@@ -96,11 +97,11 @@ def navigation_site(self, root):
         write(root, "config.toml", CONFIG)
         menu = ('<html lang="{{ lang }}">{% set resource = section %}'
                 '{% set resource_path = section.path %}'
-                '{% include "top_menu.html" %}</html>')
+                '{% include "top_menu.html" %}{% include "bottom_menu.html" %}</html>')
         write(root, "templates/index.html", menu)
         write(root, "templates/section.html", menu)
         write(root, "templates/page.html", "{{ page.title }}")
-        for template in ("top_menu.html", "language_selector.html"):
+        for template in ("top_menu.html", "bottom_menu.html", "language_selector.html"):
             write(root, f"templates/{template}", (ROOT / "templates" / template).read_text())
         for suffix, title in (("", "Home"), (".de", "Start")):
             write(root, f"content/_index{suffix}.md", f"---\ntitle: {title}\n---\n")
@@ -133,6 +134,29 @@ def content(path, title):
                 self.assertEqual(parser.links[:5], expected)
                 for href, _, _ in expected:
                     self.assertTrue((root / "public" / href.strip("/") / "index.html").is_file(), href)
+                footer = RenderedPage(menu_id="bottom-menu")
+                footer.feed((root / "public/de/index.html").read_text())
+                self.assertCountEqual([link for link in footer.links if link[0].startswith("/")],
+                                      expected[1:4])
+
+    def test_language_selector_declares_name_languages(self):
+        with tempfile.TemporaryDirectory() as tmp:
+            root = Path(tmp)
+            self.navigation_site(root)
+            # Exercise resource translations and the additional taxonomy-term links together.
+            menu = ('<html lang="{{ lang }}"><nav id="menu">{% set resource = section %}'
+                    '{% set term_translation_langs = ["en", "de"] %}'
+                    '{% set term_translation_urls = ["/news/releases/", "/de/news/releases/"] %}'
+                    '{% include "language_selector.html" %}</nav></html>')
+            write(root, "templates/index.html", menu)
+            self.build(root)
+            for path, foreign, label in (("", "de", "Deutsch"), ("de/", "en", "English")):
+                with self.subTest(path=path):
+                    parser = RenderedPage()
+                    parser.feed((root / "public" / path / "index.html").read_text())
+                    prefix = "/de" if foreign == "de" else ""
+                    self.assertCountEqual(parser.links, [(f"{prefix}/", label, foreign),
+                                                        (f"{prefix}/news/releases/", label, foreign)])
 
     def test_missing_default_destinations_stop_the_build(self):
         for missing, kind in (("news/_index.md", "Section"), ("donate/index.md", "Page")):

From 967fc9be3589c64e694edeefa766ccd9b5403688 Mon Sep 17 00:00:00 2001
From: Alexander Borsuk <me@alex.bio>
Date: Wed, 4 Nov 2026 01:43:48 +0100
Subject: [PATCH 04/10] Run donation layout checks in the Zola template suite

Cover valid, missing, duplicate and reordered donation markers with the Python build helper. Keep browser regressions focused on rendered checkout behavior, and document the test prerequisites in CI and contributor guidance.

Signed-off-by: Alexander Borsuk <me@alex.bio>
---
 .github/copilot-instructions.md |  6 +++---
 .github/workflows/check.yml     |  4 +---
 tools/donate_browser.test.cjs   | 31 -------------------------------
 tools/test_navigation.py        | 29 ++++++++++++++++++++++++++++-
 4 files changed, 32 insertions(+), 38 deletions(-)

diff --git a/.github/copilot-instructions.md b/.github/copilot-instructions.md
index e58d58ac4..f659c9cff 100644
--- a/.github/copilot-instructions.md
+++ b/.github/copilot-instructions.md
@@ -78,7 +78,7 @@ Use `{{ trans(key='faq-menu-title', lang=lang) }}` to get localized strings from
 zola serve           # Live preview at http://127.0.0.1:1111
 zola build           # Generate static site in public/
 npm test             # Offline translation, hook and Telegram regressions
-python3 tools/test_navigation.py # Navigation and donation language fallbacks (requires Zola)
+python3 tools/test_navigation.py # Navigation and donation template regressions (requires Zola)
 npm run test:browser # Donation checkout regressions against public/ (build first)
 npm run format       # Format MD + SCSS (stylelint + prettier + js-beautify)
 npm run upgrade      # Update npm dependencies
@@ -91,8 +91,8 @@ for Telegram publishing and the complete test suite.
 For the browser tests, install Node dependencies with `npm ci`, then install
 Chromium once with `npx playwright install chromium`. Run `zola build` before
 `npm run test:browser`. The suite reads the rendered site and declared security
-headers, mocks payment requests, and uses Zola to check invalid layout markers.
-Set `ZOLA_BIN` when the Zola executable is not on `PATH`.
+headers and mocks payment requests. The Python navigation suite uses Zola to
+check invalid donation layout markers.
 
 ### Where the tooling lives
 
diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml
index a5b4fd5e3..0b07adcbf 100644
--- a/.github/workflows/check.yml
+++ b/.github/workflows/check.yml
@@ -22,7 +22,7 @@ jobs:
           tar -zxvf zola.tar.gz
           ./zola build
 
-      - name: Navigation template regressions
+      - name: Navigation and donation template regressions
         run: PATH="$PWD:$PATH" python3 tools/test_navigation.py
 
       - uses: actions/setup-node@v6
@@ -36,8 +36,6 @@ jobs:
           npx playwright install --with-deps chromium
 
       - name: Donation checkout browser regressions
-        env:
-          ZOLA_BIN: ./zola
         run: npm run test:browser
 
   markdown:
diff --git a/tools/donate_browser.test.cjs b/tools/donate_browser.test.cjs
index 10e78a550..0ae80ce43 100644
--- a/tools/donate_browser.test.cjs
+++ b/tools/donate_browser.test.cjs
@@ -4,8 +4,6 @@ const { test, before, after } = require('node:test');
 const assert = require('node:assert/strict');
 const fs = require('node:fs');
 const path = require('node:path');
-const os = require('node:os');
-const { spawnSync } = require('node:child_process');
 const { chromium } = require('playwright');
 
 const root = path.resolve(__dirname, '..');
@@ -221,32 +219,3 @@ test('English checkout keeps its text direction inside an Arabic page', { timeou
   assert.equal(await direction('#donate-form'), 'ltr');
   assert.equal(await direction('#amount-custom'), 'ltr');
 });
-
-test('the real donation template rejects missing, duplicate and reordered layout markers', { timeout: 30000 }, () => {
-  const fixture = fs.mkdtempSync(path.join(os.tmpdir(), 'donate-markers-'));
-  try {
-    for (const dir of ['templates', 'content/donate/subscribe', 'static/js']) fs.mkdirSync(path.join(fixture, dir), { recursive: true });
-    fs.writeFileSync(path.join(fixture, 'config.toml'), 'base_url = "https://example.invalid"\n');
-    fs.copyFileSync(path.join(root, 'templates/donate.html'), path.join(fixture, 'templates/donate.html'));
-    fs.writeFileSync(path.join(fixture, 'templates/base.html'), '{% set resource = page %}{% block content %}{% endblock %}');
-    fs.writeFileSync(path.join(fixture, 'templates/_donate_form.html'), '');
-    fs.writeFileSync(path.join(fixture, 'static/js/donate-subscribe.js'), '');
-    fs.writeFileSync(path.join(fixture, 'content/donate/subscribe/index.md'), '---\ntitle: Support\nextra:\n  form:\n    form_title: Donate\n---\n');
-    const impact = '<!-- donation-impact -->';
-    const methods = '<!-- donation-methods -->';
-    const valid = `Intro\n\n${impact}\n\nImpact\n\n${methods}\n\nMethods`;
-    for (const body of [valid, valid.replace(impact, ''), valid.replace(methods, ''), valid + '\n' + impact,
-      valid + '\n' + methods, `Intro\n\n${methods}\n\nMethods\n\n${impact}\n\nImpact`]) {
-      fs.writeFileSync(path.join(fixture, 'content/donate/index.md'), '---\ntitle: Donate\ntemplate: donate.html\n---\n\n' + body);
-      const result = spawnSync(process.env.ZOLA_BIN || 'zola', ['--root', fixture, 'build', '--force'], { encoding: 'utf8', timeout: 10000 });
-      if (result.error) throw result.error;
-      if (body === valid) assert.equal(result.status, 0, result.stdout + result.stderr);
-      else {
-        assert.notEqual(result.status, 0);
-        assert.match(result.stdout + result.stderr, /exactly once, in that order/);
-      }
-    }
-  } finally {
-    fs.rmSync(fixture, { recursive: true, force: true });
-  }
-});
diff --git a/tools/test_navigation.py b/tools/test_navigation.py
index 03d66fb52..5b9f9ccf9 100644
--- a/tools/test_navigation.py
+++ b/tools/test_navigation.py
@@ -1,5 +1,5 @@
 #!/usr/bin/env python3
-"""Build small multilingual sites to test navigation with the real Zola templates."""
+"""Build small sites to test navigation and donation templates with real Zola."""
 
 import re
 import shutil
@@ -217,6 +217,33 @@ def test_donation_pages_select_companions_and_form_language(self):
                         self.assertEqual(parser.checkout_language, "de")
                         self.assertTrue((root / "public" / expected_path.strip("/") / "index.html").is_file())
 
+    def test_donation_layout_markers(self):
+        with tempfile.TemporaryDirectory() as tmp:
+            root = Path(tmp)
+            write(root, "config.toml", 'base_url = "https://example.invalid"\n')
+            write(root, "templates/donate.html", (ROOT / "templates/donate.html").read_text())
+            write(root, "templates/base.html", '{% set resource = page %}{% block content %}{% endblock %}')
+            write(root, "templates/_donate_form.html", "")
+            write(root, "static/js/donate-subscribe.js", "")
+            write(root, "content/donate/subscribe/index.md",
+                  '---\ntitle: Support\nextra:\n  form:\n    form_title: Donate\n---\n')
+            impact = "<!-- donation-impact -->"
+            methods = "<!-- donation-methods -->"
+            valid = f"Intro\n\n{impact}\n\nImpact\n\n{methods}\n\nMethods"
+            cases = {
+                "valid": valid,
+                "missing impact": valid.replace(impact, ""),
+                "missing methods": valid.replace(methods, ""),
+                "duplicate impact": valid + "\n" + impact,
+                "duplicate methods": valid + "\n" + methods,
+                "reordered": f"Intro\n\n{methods}\n\nMethods\n\n{impact}\n\nImpact",
+            }
+            for name, body in cases.items():
+                with self.subTest(layout=name):
+                    write(root, "content/donate/index.md",
+                          '---\ntitle: Donate\ntemplate: donate.html\n---\n\n' + body)
+                    self.build(root, expected_error=None if name == "valid" else "exactly once, in that order")
+
 
 if __name__ == "__main__":
     unittest.main(verbosity=2)

From c17ae48811e6800e4ee742aad89b6119102773f1 Mon Sep 17 00:00:00 2001
From: Alexander Borsuk <me@alex.bio>
Date: Wed, 4 Nov 2026 01:44:04 +0100
Subject: [PATCH 05/10] Clarify URL preservation in translation guidance

Translate reader-facing titles and descriptions while preserving published slugs and aliases. State the existing-target requirement once for localized Markdown links.

Signed-off-by: Alexander Borsuk <me@alex.bio>
---
 .github/copilot-instructions.md | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/.github/copilot-instructions.md b/.github/copilot-instructions.md
index f659c9cff..cf70cee20 100644
--- a/.github/copilot-instructions.md
+++ b/.github/copilot-instructions.md
@@ -230,7 +230,7 @@ Use containing, not matching, use pat="substring" argument (no regexes), detaile
 
 - **File naming**: Use `index.md` for pages, `_index.md` for sections
 - **Date format**: ISO 8601 with timezone (`2024-03-18T17:45:35+00:00`)
-- **Slugs**: Lowercase with hyphens, translated appropriately
+- **Slugs**: Lowercase with hyphens; preserve published values
 - **Image optimization**: Store content-related images at the same content folder. Store global images in `static/images/`, use components for consistent rendering
 - **Config order**: Sort language sections and translation keys alphabetically in `config.toml`
 
@@ -377,6 +377,5 @@ When adding a term, prefer one that is unambiguous in every context: whole-word
 - do not translate Organic Maps and ID Editor
 - do not replace amounts like 5K with zeroes (5.000), either leave it (if it is a normal language practice) or use "5 thousands" equivalent (like 5 тыс. in Russian)
 - do not insert newlines (do not split) for a yaml value in markdown frontmatters
-- replace markdown links starting with @/ and ending with index.md with index.LANGUAGE.md in each translated file.
-- also translate markdown header, including title:, description: and slug: fields
-- Replace /index.md in any links that start with @/ with /index.LANGCODE.md so links in the translated markdown file can point to the related translated page in LANGCODE language.
+- translate `title:` and `description:` in Markdown frontmatter; preserve `slug:` and `aliases:` because they define published URLs.
+- localize Markdown link targets from `@/…/index.md` to `@/…/index.LANGCODE.md` only when that translated page exists.

From 7b297de91198297ba9d668feb8dd3522bfd1ec1b Mon Sep 17 00:00:00 2001
From: Alexander Borsuk <me@alex.bio>
Date: Wed, 4 Nov 2026 16:15:42 +0100
Subject: [PATCH 06/10] Set checkout direction from its source language

Share config.extra.rtl_languages between document layout and the checkout card. Derive the card's direction from the selected subscribe page so Latin brand names cannot flip RTL headings and English fallback labels remain LTR inside an Arabic page.

Cover German and Arabic companion combinations, source-language direction, Latin-prefixed headings and the independent payment language with the real Zola templates and browser form. Document the shared direction setting.

Signed-off-by: Alexander Borsuk <me@alex.bio>
---
 .github/copilot-instructions.md |  9 ++++---
 config.toml                     |  2 ++
 templates/base.html             |  3 +--
 templates/donate.html           |  4 +--
 tools/donate_browser.test.cjs   | 14 +++++++---
 tools/test_navigation.py        | 48 ++++++++++++++++++++++-----------
 6 files changed, 54 insertions(+), 26 deletions(-)

diff --git a/.github/copilot-instructions.md b/.github/copilot-instructions.md
index cf70cee20..eaa9eb1ba 100644
--- a/.github/copilot-instructions.md
+++ b/.github/copilot-instructions.md
@@ -63,8 +63,9 @@ page's `extra.form`. The main page's Markdown contains `<!-- donation-impact -->
 and `<!-- donation-methods -->` exactly once, in that order; its template rejects
 missing, duplicate or reordered markers. JavaScript enables currency selection
 and scales presets together; without it, the form submits EUR consistently.
-The checkout card detects direction from its own labels so an English fallback
-stays left-to-right inside a right-to-left page.
+The checkout card uses the subscribe page's language and the shared
+`extra.rtl_languages` setting for direction, so English fallback labels remain
+left-to-right inside a right-to-left page.
 
 ### Translation Function
 
@@ -154,7 +155,7 @@ hook, the test suite — adds `tools/` to `sys.path` explicitly.
    # ... other translation keys
    ```
 2. Create translated content files with `.XX.md` suffix
-3. Add to RTL list in `base.html` if right-to-left language
+3. Add the language to `extra.rtl_languages` in `config.toml` if it is right-to-left.
 4. If `content/donate/subscribe/index.XX.md` is one of them, two things do **not**
    follow automatically:
    - `translate_md.py` does not touch `extra:`, so all `extra.form.*` labels
@@ -180,7 +181,7 @@ hook, the test suite — adds `tools/` to `sys.path` explicitly.
 - Main styles: `sass/main.scss`
 - Modular imports: `sass/_language_selector.scss`, `sass/_top_menu.scss`
 - Dark mode: `@media (prefers-color-scheme: dark)` blocks
-- RTL support: `dir="rtl"` on `<html>` for RTL languages
+- RTL support: `extra.rtl_languages` in `config.toml` controls document and checkout direction.
 - Responsive design: Flexbox and grid layouts with narrow-screen overrides
 
 ### Static Assets
diff --git a/config.toml b/config.toml
index 6db97fa03..8089196be 100644
--- a/config.toml
+++ b/config.toml
@@ -49,6 +49,8 @@ language_neutral_taxonomy_terms = ["linux"]
 lnurl = "stellarchin694@walletofsatoshi.com"
 ltc = "LU3PAUrAx57v6NPWxzjPkyDmkfDzfZfYq8"
 nano = "nano_3591q1zr5i5jkkj97aw1dze4ki1pkkcrux3srzgyup845pwkeqtjpx4zitaf"
+# Shared by document layout and checkout labels, whose languages can differ.
+rtl_languages = ["ar", "arc", "dv", "fa", "fa-IR", "ha", "he", "khw", "ks", "ku", "ps", "ur", "yi"]
 sol = "9Fcm6Gw5PsivSCcpxCh9GVfj9jcPgQ8Q5mZJhsEuRHJV"
 ton = "UQAOoxybV-VFPq-a_BlRh3DHyg28Yo49nL05WO3GGRzPMU7t"
 trx = "THfds4xfMXWBSBBHHAZAmdjBcLMEzESHq5"
diff --git a/templates/base.html b/templates/base.html
index 598171a52..55303f32d 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -61,8 +61,7 @@
 {%- endif -%}
 
 <!DOCTYPE html>
-{%- set rtl_langs = ["ar", "arc", "dv", "fa", "fa-IR", "ha", "he", "khw", "ks", "ku", "ps", "ur", "yi"] -%}
-<html lang="{{ lang }}" {%- if lang in rtl_langs -%} dir="rtl" {%- endif -%}>
+<html lang="{{ lang }}" {%- if lang in config.extra.rtl_languages -%} dir="rtl" {%- endif -%}>
 
 <head>
   <meta charset="utf-8">
diff --git a/templates/donate.html b/templates/donate.html
index 13f979217..b18bc5c18 100644
--- a/templates/donate.html
+++ b/templates/donate.html
@@ -20,8 +20,8 @@
       <h1 id="donate-title">{{ resource.title }}</h1>
       {{ story | first | safe }}
     </div>
-    {# Checkout labels can use a different writing direction from the surrounding page. #}
-    <section id="donation" lang="{{ subscribe.lang }}" dir="auto" class="donate-card" aria-labelledby="donate-card-title">
+    {# The labels' language controls direction even when the heading starts with a Latin brand name. #}
+    <section id="donation" lang="{{ subscribe.lang }}" dir="{% if subscribe.lang in config.extra.rtl_languages %}rtl{% else %}ltr{% endif %}" class="donate-card" aria-labelledby="donate-card-title">
       <h2 id="donate-card-title">{{ f.form_title }}</h2>
       {% include '_donate_form.html' %}
     </section>
diff --git a/tools/donate_browser.test.cjs b/tools/donate_browser.test.cjs
index 0ae80ce43..da9be7dd8 100644
--- a/tools/donate_browser.test.cjs
+++ b/tools/donate_browser.test.cjs
@@ -203,19 +203,27 @@ test('declared main-page CSP permits payment forms and includes Mollie redirect
   assert.deepEqual(posted.map(p => p.host), ['donate-api.organicmaps.app', 'www.paypal.com']);
 });
 
-test('English checkout keeps its text direction inside an Arabic page', { timeout: 30000 }, async t => {
+test('checkout direction follows its language with Latin brand names and English fallbacks', { timeout: 30000 }, async t => {
   const { page } = await openPage(t, { javaScriptEnabled: false });
   await page.goto(origin + '/ar/donate/');
   const direction = selector => page.locator(selector).evaluate(e => getComputedStyle(e).direction);
   assert.equal(await direction('#donate-form'), 'rtl');
+  await page.locator('#donate-card-title').evaluate(e => { e.textContent = 'Organic Maps — ' + e.textContent; });
+  assert.equal(await direction('#donate-form'), 'rtl');
 
-  // Use the rendered English card to exercise fallback labels inside an RTL document.
+  // Use the English card's language and direction while payment returns stay Arabic.
   await page.evaluate(html => {
     const english = new DOMParser().parseFromString(html, 'text/html');
-    document.getElementById('donation').replaceWith(english.getElementById('donation'));
+    const card = document.getElementById('donation');
+    const englishCard = english.getElementById('donation');
+    card.lang = englishCard.lang;
+    card.dir = englishCard.dir;
+    card.replaceChildren(...englishCard.childNodes);
+    card.querySelector('input[name="lang"]').value = document.documentElement.lang;
   }, fs.readFileSync(path.join(output, 'donate/index.html'), 'utf8'));
   assert.equal(await page.locator('html').getAttribute('dir'), 'rtl');
   assert.equal(await page.locator('#donate-form').evaluate(form => form.closest('[lang]').lang), 'en');
+  assert.equal((await fields(page)).lang, 'ar');
   assert.equal(await direction('#donate-form'), 'ltr');
   assert.equal(await direction('#amount-custom'), 'ltr');
 });
diff --git a/tools/test_navigation.py b/tools/test_navigation.py
index 5b9f9ccf9..e60cbe2d4 100644
--- a/tools/test_navigation.py
+++ b/tools/test_navigation.py
@@ -7,6 +7,7 @@
 import tempfile
 import unittest
 from html.parser import HTMLParser
+from itertools import product
 from pathlib import Path
 
 ROOT = Path(__file__).resolve().parent.parent
@@ -17,6 +18,7 @@
     "faq/_index.md": ("Help", "Hilfe"),
 }
 CONFIG = ('base_url = "https://example.org"\n'
+          '[extra]\nrtl_languages = ["ar"]\n'
           '[languages.de]\n[translations]\nlanguage = "English"\ncontact = "Contact"\n'
           '[languages.de.translations]\nlanguage = "Deutsch"\ncontact = "Kontakt"\n')
 
@@ -43,6 +45,7 @@ def __init__(self, menu_id="menu"):
         self.form_language = None
         self.heading_language = None
         self.checkout_language = None
+        self.card_direction = None
 
     def handle_starttag(self, tag, attrs):
         attrs = dict(attrs)
@@ -57,6 +60,8 @@ def handle_starttag(self, tag, attrs):
             self.form_language = language
         if attrs.get("id") == "donate-card-title":
             self.heading_language = language
+        if attrs.get("id") == "donation":
+            self.card_direction = attrs.get("dir")
         if tag == "input" and attrs.get("name") == "lang":
             self.checkout_language = attrs["value"]
         if tag not in self.VOID_TAGS:
@@ -172,10 +177,15 @@ def test_missing_default_destinations_stop_the_build(self):
                 self.build(root, expected_error=f"{kind} `{missing}` not found.")
 
     def test_donation_pages_select_companions_and_form_language(self):
-        for missing in ((), ("donate/index.md",), ("donate/subscribe/index.md",)):
-            with self.subTest(missing=missing), tempfile.TemporaryDirectory() as tmp:
+        cases = ((), ("donate/index.md",), ("donate/subscribe/index.md",))
+        for lang, missing in product(("de", "ar"), cases):
+            with self.subTest(lang=lang, missing=missing), tempfile.TemporaryDirectory() as tmp:
                 root = Path(tmp)
-                write(root, "config.toml", CONFIG)
+                config = CONFIG.replace("languages.de", f"languages.{lang}")
+                if lang == "ar":
+                    config = config.replace('language = "Deutsch"', 'language = "العربية"')
+                    config = config.replace('contact = "Kontakt"', 'contact = "اتصل بنا"')
+                write(root, "config.toml", config)
                 write(root, "templates/base.html", '<html lang="{{ lang }}">{% set resource = page %}'
                       '{% block header %}{% endblock %}{% block content %}{% endblock %}</html>')
                 write(root, "static/js/donate-subscribe.js", "")
@@ -190,37 +200,45 @@ def test_donation_pages_select_companions_and_form_language(self):
                 subscribe = re.sub(r"(?m)^    other_ways:.*$", "    other_ways: Default alternatives", subscribe)
                 write(root, "content/donate/index.md", donate)
                 write(root, "content/donate/subscribe/index.md", subscribe)
+                donate_title = "Spenden" if lang == "de" else "تبرع"
+                donate_slug = "spenden" if lang == "de" else "support"
+                donate_path = f"/{lang}/{donate_slug}/"
+                # A Latin brand name can precede an RTL checkout heading.
+                localized_title = "Localized checkout" if lang == "de" else "Organic Maps — تبرع"
                 if "donate/index.md" not in missing:
-                    write(root, "content/donate/index.de.md",
-                          donate.replace("title: Donate", "title: Spenden\nslug: spenden"))
+                    write(root, f"content/donate/index.{lang}.md",
+                          donate.replace("title: Donate", f"title: {donate_title}\nslug: {donate_slug}"))
                 if "donate/subscribe/index.md" not in missing:
-                    write(root, "content/donate/subscribe/index.de.md",
-                          subscribe.replace("Default", "Localized"))
+                    write(root, f"content/donate/subscribe/index.{lang}.md",
+                          subscribe.replace("Default", "Localized").replace("Localized checkout", localized_title))
 
                 self.build(root)
-                expected_path = "/donate/" if "donate/index.md" in missing else "/de/spenden/"
+                expected_path = "/donate/" if "donate/index.md" in missing else donate_path
+                label = "Default" if "donate/subscribe/index.md" in missing else "Localized"
+                form_lang = "en" if label == "Default" else lang
                 for page in ("donate/index.md", "donate/subscribe/index.md"):
                     if page in missing:
                         continue
                     with self.subTest(page=page):
-                        path = "/de/spenden/" if page == "donate/index.md" else "/de/donate/subscribe/"
+                        path = donate_path if page == "donate/index.md" else f"/{lang}/donate/subscribe/"
                         output = (root / "public" / path.strip("/") / "index.html").read_text()
-                        label = "Default" if "donate/subscribe/index.md" in missing else "Localized"
                         self.assertIn(f'href="{expected_path}#other-ways">{label} alternatives</a>', output)
                         if page == "donate/index.md":
-                            self.assertIn(f'>{label} checkout</h2>', output)
+                            title = "Default checkout" if label == "Default" else localized_title
+                            self.assertIn(f'>{title}</h2>', output)
                         parser = RenderedPage()
                         parser.feed(output)
-                        self.assertEqual(parser.form_language, "en" if label == "Default" else "de")
+                        self.assertEqual(parser.form_language, form_lang)
                         if page == "donate/index.md":
-                            self.assertEqual(parser.heading_language, "en" if label == "Default" else "de")
-                        self.assertEqual(parser.checkout_language, "de")
+                            self.assertEqual(parser.heading_language, form_lang)
+                            self.assertEqual(parser.card_direction, "rtl" if form_lang == "ar" else "ltr")
+                        self.assertEqual(parser.checkout_language, lang)
                         self.assertTrue((root / "public" / expected_path.strip("/") / "index.html").is_file())
 
     def test_donation_layout_markers(self):
         with tempfile.TemporaryDirectory() as tmp:
             root = Path(tmp)
-            write(root, "config.toml", 'base_url = "https://example.invalid"\n')
+            write(root, "config.toml", 'base_url = "https://example.invalid"\n[extra]\nrtl_languages = []\n')
             write(root, "templates/donate.html", (ROOT / "templates/donate.html").read_text())
             write(root, "templates/base.html", '{% set resource = page %}{% block content %}{% endblock %}')
             write(root, "templates/_donate_form.html", "")

From f4b3fa450f56b3bbdf5a5906b18e82e07907036a Mon Sep 17 00:00:00 2001
From: Alexander Borsuk <me@alex.bio>
Date: Wed, 4 Nov 2026 16:15:42 +0100
Subject: [PATCH 07/10] Keep language navigation tied to resource translations

Build language-selector links and automatic redirects from resource translations. Document that translation summaries use path for content files and permalink for browser URLs, while full resources expose browser routes in path. Keep the multilingual fixture focused on generated resource links and their label languages.

Signed-off-by: Alexander Borsuk <me@alex.bio>
---
 .github/copilot-instructions.md  |  2 +-
 templates/language_redirect.html |  4 ----
 templates/language_selector.html | 14 +-------------
 tools/test_navigation.py         |  6 +-----
 4 files changed, 3 insertions(+), 23 deletions(-)

diff --git a/.github/copilot-instructions.md b/.github/copilot-instructions.md
index eaa9eb1ba..a19dbd606 100644
--- a/.github/copilot-instructions.md
+++ b/.github/copilot-instructions.md
@@ -193,7 +193,7 @@ hook, the test suite — adds `tools/` to `sys.path` explicitly.
 ### URLs across production and previews
 
 - Use root-relative URLs for browser navigation and assets hosted by this site (`/main.css`, `/js/…`, `/de/faq/`). A path relative to the current page, such as `main.css`, breaks on localized and nested pages.
-- In templates, use a resource's `.path` for an internal link. When only `.permalink` is available, strip `config.base_url` from that known site permalink. For a cache-busted asset, use `get_url(path="…", cachebust=true) | replace(from=config.base_url, to="") | safe` so the hash remains but the browser loads the asset from the current deployment.
+- In templates, use a full resource's `.path` for an internal link. Entries in `.translations` are summaries: their `.path` identifies a content file, so use their `.permalink` with `config.base_url` stripped for browser navigation. For a cache-busted asset, use `get_url(path="…", cachebust=true) | replace(from=config.base_url, to="") | safe` so the hash remains but the browser loads the asset from the current deployment.
 - Keep absolute URLs where the consumer needs them: canonical and hreflang tags, OpenGraph and structured data, sitemaps, external services, and the donation form's cross-origin API action. A preview that tests payments must explicitly target a staging API; a relative form action would hit the Pages site instead.
 - Do not hard-code `https://organicmaps.app` for new same-site links. Markdown `@/…` links are still required for translation-aware cross-references; Zola expands them using `base_url`, so preview builds need a deployment-specific `base_url` if those links must stay on the preview. Do not blindly replace URLs in rendered Markdown: an article may intentionally quote or link to the public site.
 
diff --git a/templates/language_redirect.html b/templates/language_redirect.html
index cac0e0966..6ba799ed2 100644
--- a/templates/language_redirect.html
+++ b/templates/language_redirect.html
@@ -9,10 +9,6 @@
     {% for translation in resource.translations -%}
     "{{ translation.lang }}": "{{ translation.permalink  | replace(from=config.base_url, to="") | safe }}",
     {% endfor -%}
-    {%- elif term_translation_langs is defined and term_translation_langs | length > 0 -%}
-    {% for i in range(end=term_translation_langs | length) -%}
-    "{{ term_translation_langs[i] }}": "{{ term_translation_urls[i] | replace(from=config.base_url, to="") | safe }}",
-    {% endfor -%}
     {%- endif %}
   };
   var userPreferredLanguages = navigator.languages ? navigator.languages : [navigator.language];
diff --git a/templates/language_selector.html b/templates/language_selector.html
index 4a74442a7..630483cbf 100644
--- a/templates/language_selector.html
+++ b/templates/language_selector.html
@@ -7,8 +7,7 @@
   </script>
   <!-- Hidden checkbox is used for pure CSS toggle menu. -->
   {% set translations = resource | get(key="translations", default=[]) %}
-  {%- set has_term_translations = term_translation_langs is defined and term_translation_langs | length > 0 -%}
-  {% if translations | length > 1 or has_term_translations %}
+  {% if translations | length > 1 %}
   <input type="checkbox" id="lang-menu-trigger" class="lang-menu-trigger" />
   {% endif %}
   <label class="no-print" for="lang-menu-trigger">
@@ -25,17 +24,6 @@
     </li>
     {% endif %}
     {% endfor %}
-    {%- if has_term_translations -%}
-    {%- for i in range(end=term_translation_langs | length) -%}
-    {%- if term_translation_langs[i] != lang %}
-    <li class="lang-menu-item" role="menuitem">
-      <a lang="{{ term_translation_langs[i] }}" class="lang-menu-link" onclick="return onLanguageClick('{{ term_translation_langs[i] }}');" href="{{ term_translation_urls[i] | replace(from=config.base_url, to="") | safe }}">
-        {{ trans(key="language", lang=term_translation_langs[i]) }}
-      </a>
-    </li>
-    {%- endif -%}
-    {%- endfor -%}
-    {%- endif -%}
   </ul>
   <script>
     (function () {
diff --git a/tools/test_navigation.py b/tools/test_navigation.py
index e60cbe2d4..cd1b63546 100644
--- a/tools/test_navigation.py
+++ b/tools/test_navigation.py
@@ -148,10 +148,7 @@ def test_language_selector_declares_name_languages(self):
         with tempfile.TemporaryDirectory() as tmp:
             root = Path(tmp)
             self.navigation_site(root)
-            # Exercise resource translations and the additional taxonomy-term links together.
             menu = ('<html lang="{{ lang }}"><nav id="menu">{% set resource = section %}'
-                    '{% set term_translation_langs = ["en", "de"] %}'
-                    '{% set term_translation_urls = ["/news/releases/", "/de/news/releases/"] %}'
                     '{% include "language_selector.html" %}</nav></html>')
             write(root, "templates/index.html", menu)
             self.build(root)
@@ -160,8 +157,7 @@ def test_language_selector_declares_name_languages(self):
                     parser = RenderedPage()
                     parser.feed((root / "public" / path / "index.html").read_text())
                     prefix = "/de" if foreign == "de" else ""
-                    self.assertCountEqual(parser.links, [(f"{prefix}/", label, foreign),
-                                                        (f"{prefix}/news/releases/", label, foreign)])
+                    self.assertEqual(parser.links, [(f"{prefix}/", label, foreign)])
 
     def test_missing_default_destinations_stop_the_build(self):
         for missing, kind in (("news/_index.md", "Section"), ("donate/index.md", "Page")):

From 7964027476d68cee41016b26dc2b1d48d3baee3e Mon Sep 17 00:00:00 2001
From: Alexander Borsuk <me@alex.bio>
Date: Wed, 4 Nov 2026 16:15:42 +0100
Subject: [PATCH 08/10] Use native language names and preserve product brands

Show Nederlands and Galego in language navigation so each name matches its declared language. Keep Organic Maps and Google Play unchanged in Galician, Hindi, Indonesian, Marathi and Occitan installation labels. Explain that the selector's language key contains the language's own name.

Signed-off-by: Alexander Borsuk <me@alex.bio>
---
 config.toml | 29 +++++++++++++++--------------
 1 file changed, 15 insertions(+), 14 deletions(-)

diff --git a/config.toml b/config.toml
index 8089196be..72d73e9c3 100644
--- a/config.toml
+++ b/config.toml
@@ -81,6 +81,7 @@ token = "Token"
 
 # Rest of other languages
 # Please sort all other translation sections and values in alphabetical order.
+# The language key is the language's own name, such as "Nederlands", for the selector.
 
 # Language: af (Afrikaans / Afrikaans)
 [languages.af]
@@ -394,7 +395,7 @@ name = "Nom"
 news-term-description = "Actualités et mises à jour {} d'Organic Maps."
 token = "Jeton"
 
-# Language: gl (Galician / Gallego)
+# Language: gl (Galician / Galego)
 [languages.gl]
 taxonomies = [
   {name = "faq", feed = false},
@@ -409,11 +410,11 @@ engines = "Motores TTS admitidos"
 faq-menu-title = "Preguntas frecuentes"
 faq-term-description = "Preguntas frecuentes sobre {} en Organic Maps."
 go-to-top = "Ir ao comezo"
-install-appgallery = "Instalar mapas orgánicos desde Huawei AppGallery"
+install-appgallery = "Instala Organic Maps desde Huawei AppGallery"
 install-appstore = "Instala Organic Maps desde a AppStore"
 install-googleplay = "Instala Organic Maps desde Google Play"
 install-fdroid = "Instala Organic Maps desde F-Droid"
-language = "Gallego"
+language = "Galego"
 language-word = "Idioma"
 more-info-om = "Para obter máis información, visite o noso sitio web"
 name = "Nome"
@@ -461,10 +462,10 @@ engines = "समर्थित TTS इंजन"
 faq-menu-title = "F.A.Q."
 faq-term-description = "Organic Maps में {} के बारे में अक्सर पूछे जाने वाले प्रश्न।"
 go-to-top = "शीर्ष पर जाएं"
-install-appgallery = "Huawei AppGallery से ऑर्गेनिक मैप इंस्टॉल करें"
-install-appstore = "AppStore से ऑर्गेनिक मैप इंस्टॉल करें"
-install-googleplay = "गूगल प्ले से ऑर्गेनिक मैप इंस्टॉल करें"
-install-fdroid = "F-Droid से ऑर्गेनिक मैप्स इंस्टॉल करें"
+install-appgallery = "Huawei AppGallery से Organic Maps इंस्टॉल करें"
+install-appstore = "AppStore से Organic Maps इंस्टॉल करें"
+install-googleplay = "Google Play से Organic Maps इंस्टॉल करें"
+install-fdroid = "F-Droid से Organic Maps इंस्टॉल करें"
 language = "हिंदी"
 language-word = "भाषा"
 more-info-om = "अधिक जानकारी के लिए कृपया हमारी वेबसाइट पर जाएं"
@@ -516,7 +517,7 @@ go-to-top = "Pergi ke Atas"
 install-appgallery = "Instal Organic Maps dari Huawei AppGallery"
 install-appstore = "Instal Organic Maps dari AppStore"
 install-googleplay = "Instal Organic Maps dari Google Play"
-install-fdroid = "Instal Peta Organik dari F-Droid"
+install-fdroid = "Instal Organic Maps dari F-Droid"
 language = "Bahasa Indonesia"
 language-word = "Bahasa"
 more-info-om = "Untuk informasi lebih lanjut, silakan kunjungi situs web kami"
@@ -593,7 +594,7 @@ faq-term-description = "Organic Maps मधील {} बद्दल वार
 go-to-top = "वर जा"
 install-appgallery = "Huawei AppGallery द्वारे Organic Maps स्थापित करा"
 install-appstore = "App Store द्वारे Organic Maps स्थापित करा"
-install-googleplay = "गूगल प्ले द्वारे Organic Maps स्थापित करा"
+install-googleplay = "Google Play द्वारे Organic Maps स्थापित करा"
 install-fdroid = "F-Droid द्वारे Organic Maps स्थापित करा"
 language = "मराठी"
 language-word = "भाषा"
@@ -673,7 +674,7 @@ install-appgallery = "Installeer Organic Maps in de Huawei AppGallery"
 install-appstore = "Installeer Organic Maps in de AppStore"
 install-googleplay = "Installeer Organic Maps op Google Play"
 install-fdroid = "Installeer Organic Maps op F-Droid"
-language = "Dutch"
+language = "Nederlands"
 language-word = "Taal"
 more-info-om = "Voor meer informatie, bezoek alstublieft onze website"
 name = "Naam"
@@ -695,10 +696,10 @@ engines = "Motors TTS suportats"
 faq-menu-title = "F.A.Q."
 faq-term-description = "Questions frequentas sus {} dins Organic Maps."
 go-to-top = "Anar amont"
-install-appgallery = "Installar Mapas Organicas de l’AppGallery de Huawei"
-install-appstore = "Installar Mapas Organicas de l’AppStore"
-install-googleplay = "Installar Mapas Organicas de Google Play"
-install-fdroid = "Installar Mapas Organicas de F-Droid"
+install-appgallery = "Installar Organic Maps de l’AppGallery de Huawei"
+install-appstore = "Installar Organic Maps de l’AppStore"
+install-googleplay = "Installar Organic Maps de Google Play"
+install-fdroid = "Installar Organic Maps de F-Droid"
 language = "Occitan"
 language-word = "Lenga"
 more-info-om = "Per mai d'informacions, visitatz nòstre site web"

From 8e04ed2a9df8a3b0ab2019b205ec05a8274b8891 Mon Sep 17 00:00:00 2001
From: Alexander Borsuk <me@alex.bio>
Date: Wed, 4 Nov 2026 16:15:42 +0100
Subject: [PATCH 09/10] Resolve footer translations directly from default
 resources

Use the default-language inventory's relative source paths for localized page and section lookups, retaining the default resource when a translation is absent. Classify resources by their complete source filename so checkout directory names and translated URL slugs cannot affect lookup.

Use full resource paths for navigation and declare the API tooltip's English language. Exercise mixed translation availability, an ordinary page with _index in its filename and a translated slug, and a checkout directory containing _index.

Signed-off-by: Alexander Borsuk <me@alex.bio>
---
 .github/copilot-instructions.md |  2 +-
 templates/bottom_menu.html      | 17 ++++++++---------
 tools/test_navigation.py        | 14 +++++++++++---
 3 files changed, 20 insertions(+), 13 deletions(-)

diff --git a/.github/copilot-instructions.md b/.github/copilot-instructions.md
index a19dbd606..49e83dd30 100644
--- a/.github/copilot-instructions.md
+++ b/.github/copilot-instructions.md
@@ -172,7 +172,7 @@ hook, the test suite — adds `tools/` to `sys.path` explicitly.
 - Top menu built dynamically in `templates/top_menu.html`
 - Reads pages via `get_section()` and `get_page()`
 - The top menu looks up each destination with `lang=lang, allow_missing=true`, then strictly loads the default-language resource if its translation is absent. Missing required default resources stop the build.
-- The bottom menu selects translations from the default-language inventory via `[t for t in page.translations if t.lang == lang] | first` because Tera v2 has no `filter` filter.
+- The bottom menu builds its inventory from default-language resources, then looks up each translation directly using the resource's `relative_path`. Missing translations retain the default resource. The source filename distinguishes sections from pages independently of the checkout directory and translated URL.
 - Menu labels, language-selector names and donation checkout text declare their own language so assistive technology can pronounce them correctly. The checkout API still receives the donation page's language for its return URLs.
 - Menu titles from `extra.menu_title` in content frontmatter
 
diff --git a/templates/bottom_menu.html b/templates/bottom_menu.html
index dccb0da4d..ceca37212 100644
--- a/templates/bottom_menu.html
+++ b/templates/bottom_menu.html
@@ -3,24 +3,23 @@
 
 <nav id="bottom-menu" role="navigation">
   {% for page in [home, news, ...home.pages] %}
-  {% set translated = [t for t in page.translations if t.lang == lang] | first %}
-  {% if translated %}
-    {% if "_index" in translated.path %}
-      {% set page = get_section(path=translated.path) %}
-    {% else %}
-      {% set page = get_page(path=translated.path) %}
-    {% endif %}
+  {# Default-language sections use the exact filename _index.md; guide_index.md is a page. #}
+  {% if page.relative_path | split(pat="/") | last == "_index.md" %}
+    {% set translated = get_section(path=page.relative_path, lang=lang, allow_missing=true) %}
+  {% else %}
+    {% set translated = get_page(path=page.relative_path, lang=lang, allow_missing=true) %}
   {% endif %}
+  {% if translated %}{% set page = translated %}{% endif %}
 
   {% if page.extra.menu_title %}
-  {% if resource_path != page.path %}<a lang="{{ page.lang }}" href="{{ page.permalink | replace(from=config.base_url, to="") | safe }}">{% endif %}
+  {% if resource_path != page.path %}<a lang="{{ page.lang }}" href="{{ page.path | safe }}">{% endif %}
     <span>{{ page.extra.menu_title }}</span>
     {%- if resource_path != page.path %}</a>{% endif %}
   &nbsp;
   {% endif %}
   {% endfor %}
 
-  <a href="https://omaps.app/api" title="How to open Organic Maps from other apps and pass the data back">API</a>
+  <a lang="en" href="https://omaps.app/api" title="How to open Organic Maps from other apps and pass the data back">API</a>
   &nbsp;
   <a href="mailto:hello@organicmaps.app">{{ trans(key='contact', lang=lang) }}</a>
 </nav>
diff --git a/tools/test_navigation.py b/tools/test_navigation.py
index cd1b63546..29d2bc7ae 100644
--- a/tools/test_navigation.py
+++ b/tools/test_navigation.py
@@ -116,7 +116,8 @@ def test_missing_translations_use_default_language_destinations(self):
         # other destinations must still use their available translations.
         cases = [(), tuple(DESTINATIONS), *((path,) for path in DESTINATIONS)]
         for missing in cases:
-            with self.subTest(missing=missing), tempfile.TemporaryDirectory() as tmp:
+            # Resource kinds must not depend on the checkout directory's name.
+            with self.subTest(missing=missing), tempfile.TemporaryDirectory(prefix="navigation_index-") as tmp:
                 root = Path(tmp)
 
                 def content(path, title):
@@ -132,17 +133,24 @@ def content(path, title):
                     expected.append((f"{prefix}/{path.split('/')[0]}/",
                                      english if path in missing else german,
                                      "en" if path in missing else "de"))
+                # An ordinary page can contain "_index" in its filename and have a translated slug.
+                content("content/guide_index.md", "Guide")
+                write(root, "content/guide_index.de.md",
+                      '---\ntitle: Anleitung\nslug: anleitung\nextra:\n  menu_title: Anleitung\n---\n')
+                guide = ("/de/anleitung/", "Anleitung", "de")
 
                 self.build(root)
                 parser = RenderedPage()
                 parser.feed((root / "public/de/index.html").read_text())
                 self.assertEqual(parser.links[:5], expected)
-                for href, _, _ in expected:
+                for href, _, _ in [*expected, guide]:
                     self.assertTrue((root / "public" / href.strip("/") / "index.html").is_file(), href)
                 footer = RenderedPage(menu_id="bottom-menu")
                 footer.feed((root / "public/de/index.html").read_text())
                 self.assertCountEqual([link for link in footer.links if link[0].startswith("/")],
-                                      expected[1:4])
+                                      [*expected[1:4], guide])
+                # The API link's tooltip is English on every page.
+                self.assertIn(("https://omaps.app/api", "API", "en"), footer.links)
 
     def test_language_selector_declares_name_languages(self):
         with tempfile.TemporaryDirectory() as tmp:

From ed8125b89ccd38675d486b7b88359beb364329cb Mon Sep 17 00:00:00 2001
From: Alexander Borsuk <me@alex.bio>
Date: Wed, 4 Nov 2026 16:15:42 +0100
Subject: [PATCH 10/10] Clarify translation, register and preview path guidance

Describe structural fingerprints in terms of blank-line-separated blocks while keeping one paragraph per line for readable diffs and CJK rendering. Explain the current preview-image path rule.

Align Ukrainian bookmark terminology with the glossary, document DeepL's supported formality options, and explain the current polite-address conventions.

Signed-off-by: Alexander Borsuk <me@alex.bio>
---
 .github/copilot-instructions.md | 12 ++++++------
 templates/base.html             |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/.github/copilot-instructions.md b/.github/copilot-instructions.md
index 49e83dd30..e562e663d 100644
--- a/.github/copilot-instructions.md
+++ b/.github/copilot-instructions.md
@@ -273,9 +273,9 @@ These are the invariants a translated markdown file must hold. Each one was brok
 
 **Never change `slug:` or `aliases:`.** They are published URLs. Corrections can be added by new aliases or redirects.
 
-**Structure must match the English source** line for line: same paragraphs, bullets, headings, links, and `_(Contributor)_` attributions, each attribution at the end of its bullet.
+**Structure must match the English source**: same paragraphs, bullets, headings, links, and `_(Contributor)_` attributions, each attribution at the end of its bullet.
 
-**Write one paragraph per line.** Do not hard-wrap prose. Wrapped text makes line-based tooling read every paragraph as a structural mismatch, and in CJK a soft line break renders as a visible space.
+**Write one paragraph per line.** Do not hard-wrap prose. This keeps content edits easy to review and avoids visible spaces from soft line breaks in CJK. Structural checks compare blank-line-separated blocks, so soft wrapping alone does not change the fingerprint.
 
 **`[label](target)` takes no space.** `[label] (target)` does not parse — it renders as literal text, which happened to 78 links here.
 
@@ -312,7 +312,7 @@ python3 tools/translate_check.py content/news/2026-08-04/630/   # whole folder
 python3 tools/translate_check.py index.md index.ar.md ar        # one file
 ```
 
-ERROR blocks publication — structural mismatch against the source (lines, bullets, headings, links, attributions, Tera expressions/components), leftover `<x>`/`<a0>` tags, a link that lost its opening `[`, an attribution moved out of its bullet, a lost brand, or a word spliced from two alphabets. Warnings cover polish: register in the body and reader-visible frontmatter, straight quotes, `...`, quoted brands, and suffixes stranded outside a link.
+ERROR blocks publication — structural mismatch against the source (blocks, bullets, headings, links, attributions, Tera expressions/components), leftover `<x>`/`<a0>` tags, a link that lost its opening `[`, an attribution moved out of its bullet, a lost brand, or a word spliced from two alphabets. Warnings cover polish: register in the body and reader-visible frontmatter, straight quotes, `...`, quoted brands, and suffixes stranded outside a link.
 
 A frontmatter string that is genuinely the same word in both languages —
 Dutch and Italian "Privacy", German "Name (optional)" — declares it explicitly
@@ -362,7 +362,7 @@ When adding a term, prefer one that is unambiguous in every context: whole-word
 ## When translating content from English:
 
 - The glossary above covers these mechanically for DeepL; the notes below still apply to manual and LLM proofreading.
-- "bookmark" or "bookmarks" (favorite place, saved by user) , use word "метка" or "метки" for Russian, use word "мітка" or "міткі" for Ukrainian
+- For "bookmark" or "bookmarks" (a saved favorite place), use "метка" or "метки" in Russian and "мітка" or "мітки" in Ukrainian.
 - "track" (recorded path on the map that user walked) to Russian, use word "трек"; for Lithuanian, use word "trasa"
 - "route" to Russian, use word "маршрут"
 - "icon" or "icons" (place's image symbol on the map), use word "иконка" или "иконки" for Russian
@@ -370,9 +370,9 @@ When adding a term, prefer one that is unambiguous in every context: whole-word
 - "map" use "мапа" for Ukrainian and Belarusian.
 - use "…" instead of "..."
 - use the informal / familiar second-person address (the casual "you" a brand uses to speak to a single user) consistently in every language that distinguishes formal from informal — e.g. French tu (not vous), German du (not Sie), Spanish tú (not usted), Italian tu (not Lei), Catalan/Occitan tu, Polish ty, Turkish sen, Hungarian te, Greek εσύ, European Portuguese tu. Never mix registers within a text. Exception: Brazilian Portuguese (pt-BR) informal form is "você" — keep it.
-- **Ten languages are the exception: use the FORMAL/polite address.** Russian вы (not ты), Ukrainian ви (not ти), Belarusian вы (not ты), Czech vy (not ty), Lithuanian jūs (not tu), Hindi आप (not तुम/तू), Marathi तुम्ही (not तू), Telugu మీరు (not నువ్వు), Malayalam നിങ്ങൾ (not നീ), Persian شما (not تو) — with the matching verb forms. This overrides the informal rule above for those languages only. `translate_md.py` requests `formality=prefer_more` for them and `prefer_less` for everyone else; `register_ok()` checks the result against the language's expected register.
+- **Ten languages are the exception: use the FORMAL/polite address.** Russian вы (not ты), Ukrainian ви (not ти), Belarusian вы (not ты), Czech vy (not ty), Lithuanian jūs (not tu), Hindi आप (not तुम/तू), Marathi तुम्ही (not तू), Telugu మీరు (not నువ్వు), Malayalam നിങ്ങൾ (not നീ), Persian شما (not تو) — with the matching verb forms. This overrides the informal rule above for those languages only. For DeepL targets that support the option, `translate_md.py` requests `formality=prefer_more` for these languages and `prefer_less` for the others; `register_ok()` checks the result against the language's expected register.
 
-  Russian, Ukrainian and Belarusian take the polite address by convention; Czech and Lithuanian were added by the project owner after the site had been converted the other way, so treat the informal forms you may still find in older commits as superseded. A practical benefit came with it: the informal singular forces a grammatical gender that the polite plural does not, so those two languages no longer address every reader as male. The other five are a different case: their familiar forms are for children, intimates and subordinates, so the polite form is the _unmarked_ way to address an adult stranger rather than a stiff alternative to a warm one — the opposite of French `tu` or German `du`. The app's own shipped strings settle it, addressing users formally in Hindi (66 markers to 1), Marathi (51 to 0) and Persian (49 to 0); Telugu and Malayalam have too few second-person strings to judge and follow their siblings.
+  Russian, Ukrainian, Belarusian, Czech and Lithuanian use polite address by project convention. In Hindi, Marathi, Telugu, Malayalam and Persian, the polite form is the neutral way to address an adult stranger; familiar forms imply a closer social relationship. Keep pronouns and verb forms consistent, and avoid gender-specific wording when addressing an unspecified reader.
 - prefer the target language's native quotation marks (« » for French, Spanish, Catalan, Galician, Greek, Occitan, Russian and European Portuguese; „ " for German, Czech, Polish, Hungarian, Estonian and Lithuanian; full-width quotes for Chinese; etc.) instead of straight ASCII "" or '' (programmer's) quotes.
 - use ё instead е in Russian where applicable
 - do not translate Organic Maps and ID Editor
diff --git a/templates/base.html b/templates/base.html
index 55303f32d..aeaeed9c6 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -119,7 +119,7 @@
      those into each page's output directory, which is per-language and keyed
      by slug, so resolve it against resource_path rather than the site root -
      a site-root path like 'news/2026-08-31/630/x.jpg' never exists in public/.
-     A value containing a slash is taken as a site-root path as before.
+     A value containing a slash is taken as a site-root path.
      urlencode because asset filenames may hold spaces or non-ASCII. #}
   {%- set preview_image = resource.extra.preview_image -%}
   {%- if not (preview_image is containing(pat='/')) -%}