Merge branch 'main' into add-gr-translation

Author: lysnikolaou

.github/workflows/test.yml

@@ -14,7 +14,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: ["3.10", "3.11", "3.12", "3.13"]
+        python-version: ["3.13", "3.14"]
         os: [ubuntu-latest]
 
     steps:

build_docs.py

@@ -23,7 +23,7 @@
 from __future__ import annotations
 
 from argparse import ArgumentParser, Namespace
-from collections.abc import Sequence
+from collections.abc import Iterable, Sequence
 from contextlib import suppress, contextmanager
 from dataclasses import dataclass
 import filecmp
@@ -42,7 +42,7 @@
 from pathlib import Path
 from string import Template
 from time import perf_counter, sleep
-from typing import Iterable, Literal
+from typing import Literal
 from urllib.parse import urljoin
 
 import jinja2
@@ -196,6 +196,7 @@ def __gt__(self, other):
 class Language:
     iso639_tag: str
     name: str
+    translated_name: str
     in_prod: bool
     sphinxopts: tuple
     html_only: bool = False
@@ -214,6 +215,12 @@ def repo_url(self):
         )
         return f"https://github.com/python/{repo_name}.git"
 
+    @property
+    def switcher_label(self):
+        if self.translated_name:
+            return f"{self.name} | {self.translated_name}"
+        return self.name
+
     @staticmethod
     def filter(languages, language_tags=None):
         """Filter a sequence of languages according to --languages."""
@@ -398,7 +405,7 @@ def setup_switchers(
     - Cross-link various languages in a language switcher
     - Cross-link various versions in a version switcher
     """
-    language_pairs = sorted((l.tag, l.name) for l in languages if l.in_prod)
+    language_pairs = sorted((l.tag, l.switcher_label) for l in languages if l.in_prod)
     version_pairs = [(v.name, v.picker_label) for v in reversed(versions)]
 
     switchers_template_file = HERE / "templates" / "switchers.js"
@@ -482,15 +489,15 @@ def version_info():
     """Handler for --version."""
     try:
         platex_version = head(
-            subprocess.check_output(["platex", "--version"], universal_newlines=True),
+            subprocess.check_output(["platex", "--version"], text=True),
             lines=3,
         )
     except FileNotFoundError:
         platex_version = "Not installed."
 
     try:
         xelatex_version = head(
-            subprocess.check_output(["xelatex", "--version"], universal_newlines=True),
+            subprocess.check_output(["xelatex", "--version"], text=True),
             lines=2,
         )
     except FileNotFoundError:
@@ -719,7 +726,7 @@ def build(self):
                     f"-D locale_dirs={locale_dirs}",
                     f"-D language={self.language.iso639_tag}",
                     "-D gettext_compact=0",
-                    # "-D translation_progress_classes=1",
+                    "-D translation_progress_classes=1",
                 )
             )
         if self.language.tag == "ja":
@@ -1160,13 +1167,15 @@ def parse_languages_from_config() -> list[Language]:
     """Read config.toml to discover languages to build."""
     config = tomlkit.parse((HERE / "config.toml").read_text(encoding="UTF-8"))
     defaults = config["defaults"]
+    default_translated_name = defaults.get("translated_name", "")
     default_in_prod = defaults.get("in_prod", True)
     default_sphinxopts = defaults.get("sphinxopts", [])
     default_html_only = defaults.get("html_only", False)
     return [
         Language(
             iso639_tag=iso639_tag,
             name=section["name"],
+            translated_name=section.get("translated_name", default_translated_name),
             in_prod=section.get("in_prod", default_in_prod),
             sphinxopts=section.get("sphinxopts", default_sphinxopts),
             html_only=section.get("html_only", default_html_only),

config.toml

@@ -1,5 +1,12 @@
+# name:            the English name for the language.
+# translated_name: the 'local' name for the language.
+# in_prod:         If true, include in the language switcher.
+# html_only:       If true, only create HTML files.
+# sphinxopts:      Extra options to pass to SPHINXOPTS in the Makefile.
+
 [defaults]
 # name has no default, it is mandatory.
+translated_name = ""
 in_prod = true
 html_only = false
 sphinxopts = [
@@ -13,6 +20,7 @@ name = "English"
 
 [languages.es]
 name = "Spanish"
+translated_name = "español"
 sphinxopts = [
     '-D latex_engine=xelatex',
     '-D latex_elements.inputenc=',
@@ -21,6 +29,7 @@ sphinxopts = [
 
 [languages.fr]
 name = "French"
+translated_name = "français"
 sphinxopts = [
     '-D latex_engine=xelatex',
     '-D latex_elements.inputenc=',
@@ -29,13 +38,16 @@ sphinxopts = [
 
 [languages.id]
 name = "Indonesian"
+translated_name = "Indonesia"
 in_prod = false
 
 [languages.it]
 name = "Italian"
+translated_name = "italiano"
 
 [languages.ja]
 name = "Japanese"
+translated_name = "日本語"
 sphinxopts = [
     '-D latex_engine=lualatex',
     '-D latex_elements.inputenc=',
@@ -59,6 +71,7 @@ sphinxopts = [
 
 [languages.ko]
 name = "Korean"
+translated_name = "한국어"
 sphinxopts = [
     '-D latex_engine=xelatex',
     '-D latex_elements.inputenc=',
@@ -68,20 +81,25 @@ sphinxopts = [
 
 [languages.pl]
 name = "Polish"
+translated_name = "polski"
 
 [languages.pt_BR]
 name = "Brazilian Portuguese"
+translated_name = "Português brasileiro"
 
 [languages.tr]
 name = "Turkish"
+translated_name = "Türkçe"
 
 [languages.uk]
 name = "Ukrainian"
+translated_name = "українська"
 in_prod = false
 html_only = true
 
 [languages.zh_CN]
 name = "Simplified Chinese"
+translated_name = "简体中文"
 sphinxopts = [
     '-D latex_engine=xelatex',
     '-D latex_elements.inputenc=',
@@ -90,6 +108,7 @@ sphinxopts = [
 
 [languages.zh_TW]
 name = "Traditional Chinese"
+translated_name = "繁體中文"
 sphinxopts = [
     '-D latex_engine=xelatex',
     '-D latex_elements.inputenc=',

tox.ini

@@ -3,7 +3,7 @@ requires =
     tox>=4.2
 env_list =
     lint
-    py{313, 312, 311, 310}
+    py{314, 313}
 
 [testenv]
 package = wheel