Fixed #4: language name (native) on hover

Author: rgaudin

Dockerfile

@@ -16,7 +16,7 @@ RUN \
     && /usr/local/bin/gen-home_env/bin/pip3 install --no-cache-dir -U pip \
     && /usr/local/bin/gen-home_env/bin/pip3 install \
         --no-cache-dir \
-        Jinja2==3.1.2 PyYAML==6.0.1 humanfriendly==10.0 iso639-lang==2.2.3 libzim==3.4.0 \
+        Jinja2==3.1.2 PyYAML==6.0.1 humanfriendly==10.0 libzim==3.4.0 pycountry==23.12.11 \
     # install tailwind CSS cli
     && curl -L -o /usr/local/bin/tailwindcss https://github.com/tailwindlabs/tailwindcss/releases/download/v3.4.3/tailwindcss-linux-arm64 \
     && chmod +x /usr/local/bin/tailwindcss \

gen-home.py

@@ -15,14 +15,16 @@
 
 from __future__ import annotations
 
+import collections
+import gettext
 import os
 import pathlib
 import re
 import traceback
 import urllib.parse
 
 import humanfriendly
-import iso639
+import pycountry
 import yaml
 from jinja2 import Environment, FileSystemLoader, select_autoescape
 
@@ -32,6 +34,9 @@
     # we don't NEED cython ext but it's faster so use it if avail.
     from yaml import SafeLoader
 
+LanguageDef = collections.namedtuple(
+    "LanguageDef", ["alpha_3", "alpha_2", "native", "english"]
+)
 
 src_dir = pathlib.Path(os.getenv("SRC_DIR", "/src")).expanduser().resolve()
 packages_path = (
@@ -70,6 +75,33 @@ def round_to(size: int, scale: int) -> int:
         return str(size)
 
 
+def get_lang_def(alpha_3: str) -> LanguageDef:
+    """LanguageDef tuple with parsed/prepared language info"""
+    try:
+        language = pycountry.languages.get(alpha_3=alpha_3)
+        if not language:
+            raise ValueError("")
+    except Exception:
+        return LanguageDef(alpha_3, alpha_3[:2], alpha_3, alpha_3)
+
+    try:
+        alpha_2 = language.alpha_2
+    except AttributeError:
+        alpha_2 = alpha_3[:2]
+
+    try:
+        translator = gettext.translation(
+            "iso639-3", pycountry.LOCALES_DIR, languages=[alpha_2]
+        )
+        native = translator.gettext(language.name).title()
+    except Exception:
+        native = language.name
+
+    return LanguageDef(
+        alpha_3=alpha_3, alpha_2=alpha_2, native=native, english=language.name
+    )
+
+
 env.filters["fsize"] = format_fsize
 
 
@@ -166,8 +198,8 @@ def visible(self):
             return False
 
     @property
-    def langs(self) -> list[str]:
-        return [lang[:2] for lang in self.get("languages", [])]
+    def langs(self) -> list[LanguageDef]:
+        return [get_lang_def(lang) for lang in self.get("languages", [])]
 
 
 def gen_home(fpath: pathlib.Path):
@@ -186,8 +218,8 @@ def gen_home(fpath: pathlib.Path):
     context["languages"] = {}
     context["categories"] = set()
     for package in context["packages"]:
-        for lang in package.get("languages", []):
-            context["languages"][lang] = iso639.Lang(lang).name
+        for lang in package.langs:
+            context["languages"][lang.alpha_3] = lang.native
         for tag in package.get("tags", []):
             if tag.startswith("_category:"):
                 package["category"] = tag.split(":", 1)[-1]

templates/download.html

@@ -164,7 +164,7 @@ <h2 class="flex-auto text-lg text-left">Kiwix Reader</h2>
             "
           data-target="{{ package.url }}"
           data-category="{{ package.category }}"
-          data-langs="{% if package.langs %}{% for lang in package.languages %}{{ lang }} {% endfor %}{% endif %}"
+          data-langs="{% if package.langs %}{% for lang in package.langs %}{{ lang }} {% endfor %}{% endif %}"
           data-name="{{ package.title }}"
           data-size="{% if package.download and package.download.size %}{{ package.download.size }}{% else %}0{% endif %}">
 
@@ -267,7 +267,8 @@ <h2 class="flex-auto text-lg text-left">Kiwix Reader</h2>
               {% if loop.index0 < 2 %}
               <span
                 class="rounded-md border-kwbordergrey border-solid border text-center text-[0.7em] pt-[0.32em] pb-[0.32em] px-[0.3em] uppercase me-1 last:me-0"
-              >{{ lang }}</span>
+                title="{{ lang.native }}"
+              >{{ lang.alpha_2 }}</span>
               {% endif %}
               {% endfor %}
               {% endif %}

templates/home.html

@@ -64,7 +64,7 @@
           "
           data-target="{{ package.url }}"
           data-category="{{ package.category }}"
-          data-langs="{% if package.langs %}{% for lang in package.languages %}{{ lang }} {% endfor %}{% endif %}"
+          data-langs="{% if package.langs %}{% for lang in package.langs %}{{ lang.alpha_3 }} {% endfor %}{% endif %}"
           data-name="{{ package.title }}"
           data-size="{% if package.download and package.download.size %}{{ package.download.size }}{% else %}0{% endif %}"
         >
@@ -147,7 +147,7 @@
 
               ">
                 {% for lang in package.langs %}
-                {% if loop.index0 <= 2 and lang != 'mu' %}
+                {% if loop.index0 <= 2 and lang.alpha_3 != 'mul' %}
                 <div class="
                   rounded-md
                   border-kwbordergrey
@@ -170,7 +170,7 @@
 
                   md:mb-1
                   md:last:mb-1
-                "><div class="text-[0.7em] pt-[0.1em] uppercase">{{ lang }}</div></div>
+                "><div class="text-[0.7em] pt-[0.1em] uppercase" title="{{ lang.native }}">{{ lang.alpha_2 }}</div></div>
                 {% endif %}
                 {% endfor %}
               </div>