cherrypy-foundation 1.0.0a12__py3-none-any.whl → 1.0.0a14__py3-none-any.whl

cherrypy_foundation/components/ColorModes.jinja

@@ -1,3 +1,4 @@
+{# def header="Toggle theme", light_label="Light", dark_label="Dark", auto_label="Auto" #}
 {#css vendor/bootstrap5/css/bootstrap.min.css #}
 {#js vendor/popper/popper.min.js, vendor/bootstrap5/js/bootstrap.min.js, vendor/bootstrap5/js/color-modes.js #}
 <svg class="d-none" xmlns="http://www.w3.org/2000/svg">
@@ -21,7 +22,7 @@
 </svg>
 <li>
   <span id="bd-theme" class="dropdown-item disabled">
-    <span id="bd-theme-text">{% trans %}Toggle theme{% endtrans %}</span>
+    <span id="bd-theme-text">{{ header }}</span>
     <svg aria-hidden="true"
          class="theme-icon-active visually-hidden"
          width="16"
@@ -40,7 +41,7 @@
       <use href="#sun-fill">
       </use>
     </svg>
-    {% trans %}Light{% endtrans %}
+    {{ light_label }}
   </button>
 </li>
 <li>
@@ -52,7 +53,7 @@
       <use href="#moon-stars-fill">
       </use>
     </svg>
-    {% trans %}Dark{% endtrans %}
+    {{ dark_label }}
   </button>
 </li>
 <li>
@@ -64,6 +65,6 @@
       <use href="#circle-half">
       </use>
     </svg>
-    {% trans %}Auto{% endtrans %}
+    {{ auto_label }}
   </button>
 </li>

cherrypy_foundation/components/LocaleSelection.jinja

@@ -0,0 +1,13 @@
+{# def header="Language selection" #}
+<li>
+  <h6 class="dropdown-header">{{ header }}</h6>
+</li>
+{% set cur_locale = get_translation().locale %}
+{% for locale in list_available_locales() %}
+  <li>
+    <button aria-pressed="{{ 'true' if cur_locale == locale else 'false' }}"
+            class="dropdown-item btn-locale{{ ' active' if cur_locale == locale else '' }}"
+            data-locale="{{ locale.language }}"
+            type="button">{{ locale.display_name.capitalize() }}</button>
+  </li>
+{% endfor %}

cherrypy_foundation/components/LocaleSelection.js

@@ -0,0 +1,26 @@
+/*
+ * Handle locale selection.
+ */
+document.addEventListener('DOMContentLoaded', function () {
+  const LOCALE_COOKIE_NAME = 'locale';
+  const ONE_YEAR = 60 * 60 * 24 * 365;
+
+  function setLocaleCookie(locale) {
+    document.cookie = `${LOCALE_COOKIE_NAME}=${locale}; path=/; max-age=${ONE_YEAR}; SameSite=Lax`;
+  }
+
+  function onLanguageClick(event) {
+    const locale = event.target.dataset.locale;
+    if (!locale) return;
+
+    setLocaleCookie(locale);
+
+    // Reload page so backend can use the new language
+    window.location.reload();
+  }
+
+  document.querySelectorAll('.btn-locale').forEach(btn => {
+    btn.addEventListener('click', onLanguageClick);
+  });
+  
+});

cherrypy_foundation/tests/__init__.py

@@ -0,0 +1,72 @@
+# CherryPy foundation
+# Copyright (C) 2026 IKUS Software
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+import os
+import tempfile
+import unittest
+from contextlib import contextmanager
+
+from selenium import webdriver
+
+
+class SeleniumUnitTest:
+
+    @property
+    def _session_id(self):
+        if hasattr(self, 'cookies') and self.cookies:
+            for unused, value in self.cookies:
+                for part in value.split(';'):
+                    key, unused, value = part.partition('=')
+                    if key == 'session_id':
+                        return value
+
+    @contextmanager
+    def selenium(self, headless=True, implicitly_wait=3):
+        """
+        Decorator to load selenium for a test.
+        """
+        # Skip selenium test is display is not available.
+        if not os.environ.get('DISPLAY', False):
+            raise unittest.SkipTest("selenium require a display")
+        # Start selenium driver
+        options = webdriver.ChromeOptions()
+        if headless:
+            options.add_argument('--headless')
+        options.add_argument('--disable-gpu')
+        options.add_argument('--window-size=1280,800')
+        options.add_argument('--no-sandbox')
+        options.add_argument('--disable-dev-shm-usage')
+        options.add_argument('--lang=en-US')
+        driver = webdriver.Chrome(options=options)
+        try:
+            # If logged in, reuse the same session id.
+            if self._session_id:
+                driver.get(f'{self.baseurl}/login/')
+                driver.add_cookie({"name": "session_id", "value": self.session_id})
+            # Configure download folder
+            download = os.path.join(os.path.expanduser('~'), 'Downloads')
+            os.makedirs(download, exist_ok=True)
+            self._selenium_download_dir = tempfile.mkdtemp(dir=download, prefix='selenium-download-')
+            driver.execute_cdp_cmd(
+                'Page.setDownloadBehavior', {'behavior': 'allow', 'downloadPath': self._selenium_download_dir}
+            )
+            # Set default wait.
+            driver.implicitly_wait(implicitly_wait)
+            yield driver
+        finally:
+            # Code to release resource, e.g.:
+            driver.close()
+            driver = None

cherrypy_foundation/tests/templates/test_flash.html

@@ -1,4 +1,5 @@
-<html>
+<!DOCTYPE html>
+<html lang="en">
     <head>
         <title>test-flash</title>
     </head>

cherrypy_foundation/tests/templates/test_form.html

@@ -1,4 +1,5 @@
-<html>
+<!DOCTYPE html>
+<html >
     <head>
         <title>test-form</title>
     </head>

cherrypy_foundation/tests/templates/test_url.html

@@ -1,4 +1,4 @@
-<html>
+<html lang="en">
     <head>
         <title>test-url</title>
     </head>

cherrypy_foundation/tools/i18n.py

@@ -14,95 +14,107 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
-"""Internationalization and Localization for CherryPy
+"""
+Internationalization (i18n) and Localization (l10n) support for CherryPy.
+
+This module provides a CherryPy tool that integrates GNU gettext and Babel
+to handle language selection, translations, locale-aware formatting, and
+timezone handling on a per-request basis.
+
+The active language is resolved in the following order (highest priority first):
 
-This tool provides locales and loads translations in the following order:
+1. Language explicitly set with ``with i18n.preferred_lang():``
+2. User-defined callback (``tools.i18n.func``)
+3. HTTP ``Accept-Language`` request header
+4. Default language configured via ``tools.i18n.default``
 
-1. `with i18n.preferred_lang()`
-2. `tools.i18n.func` callback function (optional)
-3. HTTP Accept-Language headers
-4. `tools.i18n.default` value
+Translations are loaded using Babel and gettext, and the resolved locale is
+available through ``i18n.get_translation()`` during request handling.
 
-The tool uses `babel` <http://babel.edgewall.org> for localization and
-handling translations. Within your Python code you can use four functions
-defined in this module and the loaded locale provided as `i18n.get_translation()`
+---------------------------------------------------------------------------
+Basic usage
+---------------------------------------------------------------------------
 
-Example::
+Within Python code, mark translatable strings using ``ugettext`` or
+``ungettext``:
 
-    from i18n import ugettext as _, ungettext
+    from i18n import gettext as _, ngettext
 
-    class MyController(object):
+    class MyController:
         @cherrypy.expose
         def index(self):
             locale = cherrypy.response.i18n.locale
-            s1 = _(u'Translateable string')
-            s2 = ungettext(u'There is one string.',
-                           u'There are more strings.', 2)
-            return u'<br />'.join([s1, s2, locale.display_name])
+            s1 = _(u"Translatable string")
+            s2 = ngettext(
+                u"There is one item.",
+                u"There are multiple items.",
+                2
+            )
+            return "<br />".join([s1, s2, locale.display_name])
 
-If you have code (e.g. database models) that is executed before the response
-object is available, use the *_lazy functions to mark the strings
-translateable. They will be translated later on, when the text is used (and
-hopefully the response object is available then).
+---------------------------------------------------------------------------
+Lazy translations
+---------------------------------------------------------------------------
 
-Example::
+If code is executed before a CherryPy response object is available
+(e.g. model definitions or module-level constants), use the ``*_lazy``
+helpers. These defer translation until the value is actually rendered:
 
-    from i18n_tool import ugettext_lazy
+    from i18n_tool import gettext_lazy
 
     class Model:
-        def __init__(self):
-            name = ugettext_lazy(u'Name of the model')
+        name = gettext_lazy(u"Model name")
 
-For your templates read the documentation of your template engine how to
-integrate babel with it. I think `Genshi<http://genshi.edgewall.org>`_ and
-`Jinja 2<http://jinja.pocoo.org`_ support it out of the box.
+---------------------------------------------------------------------------
+Templates
+---------------------------------------------------------------------------
 
+For template rendering, i18n integrate with jinja2.
 
-Settings for the CherryPy configuration::
-
-    [/]
-    tools.i18n.on = True
-    tools.i18n.default = Your language with territory (e.g. 'en_US')
-    tools.i18n.mo_dir = Directory holding the locale directories
-    tools.i18n.domain = Your gettext domain (e.g. application name)
+    {% trans %}Text to translate{% endtrans %}
+    {{ _('Text to translate') }}
+    {{ get_translation().gettext('Text to translate') }}
+    {{ get_translation().locale }}
+    {{ var | format_datetime(format='full') }}
+    {{ var | format_date(format='full') }}
 
-The mo_dir must contain subdirectories named with the language prefix
-for all translations, containing a LC_MESSAGES dir with the compiled
-catalog file in it.
+---------------------------------------------------------------------------
+Configuration
+---------------------------------------------------------------------------
 
-Example::
+Example CherryPy configuration:
 
     [/]
     tools.i18n.on = True
-    tools.i18n.default = 'en_US'
-    tools.i18n.mo_dir = '/home/user/web/myapp/i18n'
-    tools.i18n.domain = 'myapp'
+    tools.i18n.default = "en_US"
+    tools.i18n.mo_dir = "/path/to/i18n"
+    tools.i18n.domain = "myapp"
 
-    Now the tool will look for a file called myapp.mo in
-    /home/user/web/myapp/i18n/en/LC_MESSACES/
-    or generic: <mo_dir>/<language>/LC_MESSAGES/<domain>.mo
+The ``mo_dir`` directory must contain subdirectories named after language
+codes (e.g. ``en``, ``fr_CA``), each containing an ``LC_MESSAGES`` directory
+with the compiled ``.mo`` file:
 
-That's it.
+    <mo_dir>/<language>/LC_MESSAGES/<domain>.mo
 
-:License: BSD
-:Author: Thorsten Weimann <thorsten.weimann (at) gmx (dot) net>
-:Date: 2010-02-08
 """
 
-
+import logging
 import os
-import threading
 from contextlib import contextmanager
+from contextvars import ContextVar
 from functools import lru_cache
+from gettext import NullTranslations, translation
 
 import cherrypy
 import pytz
 from babel import dates
 from babel.core import Locale, get_global
-from babel.support import LazyProxy, NullTranslations, Translations
+from babel.support import LazyProxy, Translations
 
-# Store current translation and preferred_lang
-_current = threading.local()
+_preferred_lang = ContextVar('preferred_lang', default=())
+_preferred_timezone = ContextVar('preferred_timezone', default=())
+_translation = ContextVar('translation', default=None)
+_tzinfo = ContextVar('tzinfo', default=None)
 
 
 def _get_config(key, default=None):
@@ -122,21 +134,20 @@ def preferred_lang(lang):
     with i18n.preferred_lang('fr'):
         i18n.gettext('some string')
     """
-    assert lang is None or isinstance(lang, str)
-    prev_lang = getattr(_current, 'preferred_lang', [])
-    prev_trans = getattr(_current, 'translation', None)
+    if not (lang is None or isinstance(lang, str)):
+        raise ValueError(lang)
     try:
-        # Update prefered lang and clear translation.
+        # Update preferred lang and clear translation.
         if lang:
-            _current.preferred_lang = [lang]
-        elif hasattr(_current, 'preferred_lang'):
-            del _current.preferred_lang
-        _current.translation = None
+            token_l = _preferred_lang.set((lang,))
+        else:
+            token_l = _preferred_lang.set(tuple())
+        token_t = _translation.set(None)
         yield
     finally:
         # Restore previous value
-        _current.preferred_lang = prev_lang
-        _current.translation = prev_trans
+        _preferred_lang.reset(token_l)
+        _translation.reset(token_t)
 
 
 @contextmanager
@@ -147,22 +158,24 @@ def preferred_timezone(timezone):
     with i18n.preferred_lang('America/Montreal'):
         i18n.format_datetime(...)
     """
-    assert timezone is None or isinstance(timezone, str)
-    prev_timezone = getattr(_current, 'preferred_timezone', [])
-    prev_tzinfo = getattr(_current, 'tzinfo', None)
+    if not (timezone is None or isinstance(timezone, str)):
+        raise ValueError(timezone)
     try:
-        # Update prefered lang and clear translation.
-        _current.preferred_timezone = [timezone] + prev_timezone
-        _current.tzinfo = None
+        # Update preferred timezone and clear tzinfo.
+        if timezone:
+            token_t = _preferred_timezone.set((timezone,))
+        else:
+            token_t = _preferred_timezone.set(tuple())
+        token_z = _tzinfo.set(None)
         yield
     finally:
         # Restore previous value
-        _current.preferred_timezone = prev_timezone
-        _current.tzinfo = prev_tzinfo
+        _preferred_timezone.reset(token_t)
+        _tzinfo.reset(token_z)
 
 
-@lru_cache(maxsize=10)
-def _search_translation(dirname, domain, *locales):
+@lru_cache(maxsize=32)
+def _search_translation(dirname, domain, *locales, sourcecode_lang='en'):
     """
     Loads the first existing translations for known locale.
 
@@ -170,29 +183,37 @@ def _search_translation(dirname, domain, *locales):
         langs : List
             List of languages as returned by `parse_accept_language_header`.
         dirname : String
-            Directory of the translations (`tools.I18nTool.mo_dir`).
-            Might be a list of directories.
+            A single directory of the translations (`tools.i18n.mo_dir`).
         domain : String
-            Gettext domain of the catalog (`tools.I18nTool.domain`).
+            Gettext domain of the catalog (`tools.i18n.domain`).
 
     :returns: Translations, the corresponding Locale object.
     """
     if not isinstance(locales, (list, tuple)):
-        locales = [locales]
-    t = Translations.load(dirname, locales, domain)
-    # Ignore null translation
-    if t.__class__ is NullTranslations:
-        return None
-    # Assign prefered local to this translation to know the current locale.
-    trans_locale = Locale.parse(t.files[0].split('/')[-3])
+        locales = tuple(locales)
+
+    # Loop on each locales to find the best matching translation.
     for locale in locales:
         try:
-            locale = Locale.parse(locale)
-            if trans_locale == locale or trans_locale.language == locale.language:
-                t.locale = locale
-                break
-        except ValueError:
-            continue  # Invalid locale identifier
+            # Use `gettext.translation()` instead of `gettext.find()` to chain translation fr_CA -> fr -> src.
+            t = translation(domain=domain, localedir=dirname, languages=[locale], fallback=True, class_=Translations)
+        except Exception:
+            # If exception occur while loading the translation file. The file is probably corrupted.
+            cherrypy.log(
+                f'failed to load gettext catalog domain={domain} localedir={dirname} locale={locale}',
+                context='I18N',
+                severity=logging.WARNING,
+                traceback=True,
+            )
+            continue
+        if t.__class__ is NullTranslations and not locale.startswith(sourcecode_lang):
+            # Continue searching if translation is not found.
+            continue
+        t.locale = Locale.parse(locale)
+        return t
+    # If translation file not found, return default
+    t = NullTranslations()
+    t.locale = Locale(sourcecode_lang)
     return t
 
 
@@ -200,23 +221,37 @@ def get_language_name(lang_code):
     """
     Translate the language code into it's language display name.
     """
-    locale = Locale.parse(lang_code)
-    trans = get_translation()
-    return locale.get_language_name(trans.locale)
+    try:
+        locale = Locale.parse(lang_code)
+    except Exception:
+        return lang_code
+    translation = get_translation()
+    return locale.get_language_name(translation.locale)
 
 
 def get_timezone():
     """
     Get the best timezone information for the current context.
+
+    The timezone returned is determined with the following priorities:
+
+    * value of preferred_timezone()
+    * tools.i18n.default_timezone
+    * default server time.
+
     """
     # When tzinfo is defined, use it
-    tzinfo = getattr(_current, 'tzinfo', None)
+    tzinfo = _tzinfo.get()
     if tzinfo is not None:
         return tzinfo
     # Otherwise search for a valid timezone.
-    tzinfo = None
-    default_timezone = _get_config('tools.i18n.default_timezone')
-    preferred_timezone = getattr(_current, 'preferred_timezone', [default_timezone])
+    default = _get_config('tools.i18n.default_timezone')
+    preferred_timezone = _preferred_timezone.get()
+    if default and default not in preferred_timezone:
+        preferred_timezone = (
+            *preferred_timezone,
+            default,
+        )
     for timezone in preferred_timezone:
         try:
             tzinfo = dates.get_timezone(timezone)
@@ -226,8 +261,8 @@ def get_timezone():
     # If we can't find a valid timezone using the default and preferred value, fall back to server timezone.
     if tzinfo is None:
         tzinfo = dates.get_timezone(None)
-    _current.tzinfo = tzinfo
-    return _current.tzinfo
+    _tzinfo.set(tzinfo)
+    return tzinfo
 
 
 def get_translation():
@@ -235,37 +270,48 @@ def get_translation():
     Get the best translation for the current context.
     """
     # When translation is defined, use it
-    translation = getattr(_current, 'translation', None)
+    translation = _translation.get()
     if translation is not None:
         return translation
 
     # Otherwise, we need to search the translation.
     # `preferred_lang` should always has a sane value within a cherrypy request because of hooks
     # But we also need to support calls outside cherrypy.
+    sourcecode_lang = _get_config('tools.i18n.sourcecode_lang', 'en')
     default = _get_config('tools.i18n.default')
-    preferred_lang = getattr(_current, 'preferred_lang', [default])
+    preferred_lang = _preferred_lang.get()
+    if default and default not in preferred_lang:
+        preferred_lang = (
+            *preferred_lang,
+            default,
+        )
     mo_dir = _get_config('tools.i18n.mo_dir')
-    domain = _get_config('tools.i18n.domain')
-    trans = _search_translation(mo_dir, domain, *preferred_lang)
-    if trans is None:
-        trans = NullTranslations()
-        trans.locale = Locale('en')
-    _current.translation = trans
-    return _current.translation
+    domain = _get_config('tools.i18n.domain', 'messages')
+    translation = _search_translation(mo_dir, domain, *preferred_lang, sourcecode_lang=sourcecode_lang)
+    _translation.set(translation)
+    return translation
 
 
 def list_available_locales():
     """
     Return a list of available translations.
     """
-    mo_dir = _get_config('tools.i18n.mo_dir', False)
-    domain = _get_config('tools.i18n.domain')
+    return_value = []
+    # Always return the source code locale.
+    sourcecode_lang = _get_config('tools.i18n.sourcecode_lang', 'en')
+    return_value.append(Locale.parse(sourcecode_lang))
+    # Then scan language directory for more translation.
+    mo_dir = _get_config('tools.i18n.mo_dir')
+    domain = _get_config('tools.i18n.domain', 'messages')
     if not mo_dir:
         return
     for lang in os.listdir(mo_dir):
-        trans = _search_translation(mo_dir, domain, lang)
-        if trans is not None:
-            yield trans.locale
+        if os.path.exists(os.path.join(mo_dir, lang, 'LC_MESSAGES', f'{domain}.mo')):
+            try:
+                return_value.append(Locale.parse(lang))
+            except Exception:
+                continue
+    return return_value
 
 
 def list_available_timezones():
@@ -278,7 +324,7 @@ def list_available_timezones():
 
 
 # Public translation functions
-def ugettext(message):
+def gettext(message):
     """Standard translation function. You can use it in all your exposed
     methods and everywhere where the response object is available.
 
@@ -289,13 +335,13 @@ def ugettext(message):
     :returns: The translated message.
     :rtype: Unicode
     """
-    return get_translation().ugettext(message)
+    return get_translation().gettext(message)
 
 
-gettext = ugettext
+ugettext = gettext
 
 
-def ungettext(singular, plural, num):
+def ngettext(singular, plural, num):
     """Like ugettext, but considers plural forms.
 
     :parameters:
@@ -310,34 +356,29 @@ def ungettext(singular, plural, num):
     :returns: The translated message as singular or plural.
     :rtype: Unicode
     """
-    return get_translation().ungettext(singular, plural, num)
+    return get_translation().ngettext(singular, plural, num)
 
 
-ngettext = ungettext
+ungettext = ngettext
 
 
 def gettext_lazy(message):
-    """Like ugettext, but lazy.
+    """Like gettext, but lazy.
 
     :returns: A proxy for the translation object.
     :rtype: LazyProxy
     """
 
     def func():
-        return get_translation().ugettext(message)
+        return get_translation().gettext(message)
 
     return LazyProxy(func, enable_cache=False)
 
 
 def format_datetime(datetime=None, format='medium', tzinfo=None):
     """
-    Wraper arround babel format_datetime to provide a default locale.
-    The timezone used to format the date is determine with the following priorities:
-    * value of tzinfo
-    * value of get_timezone()
-    * default server time.
+    Wrapper around babel format_datetime to use current locale and current timezone.
     """
-    # When formating date or english, let use en_GB as it's to most complete translation.
     return dates.format_datetime(
         datetime=datetime,
         format=format,
@@ -348,14 +389,19 @@ def format_datetime(datetime=None, format='medium', tzinfo=None):
 
 def format_date(datetime=None, format='medium', tzinfo=None):
     """
-    Wraper arround babel format_date to provide a default locale.
+    Wrapper around babel format_date to provide a default locale.
     """
-    return format_datetime(datetime=datetime, format=dates.get_date_format(format), tzinfo=tzinfo)
+    # To enforce the timezone and locale, make use of format_datetime for dates.
+    return dates.format_datetime(
+        datetime=datetime,
+        format=dates.get_date_format(format),
+        locale=get_translation().locale,
+        tzinfo=tzinfo or get_timezone(),
+    )
 
 
-def get_timezone_name(tzinfo):
-    locale = Locale(get_translation().locale.language)
-    return dates.get_timezone_name(tzinfo, width='long', locale=locale)
+def get_timezone_name(tzinfo, width='long'):
+    return dates.get_timezone_name(tzinfo, width=width, locale=get_translation().locale)
 
 
 def _load_default(mo_dir, domain, default, **kwargs):
@@ -363,35 +409,60 @@ def _load_default(mo_dir, domain, default, **kwargs):
     Initialize the language using the default value from the configuration.
     """
     # Clear current translation
-    _current.preferred_lang = [default]
-    _current.preferred_timezone = [kwargs['default_timezone']] if 'default_timezone' in kwargs else []
-    cherrypy.request._i18n_lang_func = kwargs.get('lang', kwargs.get('func', False))
-    cherrypy.request._i18n_tzinfo_func = kwargs.get('tzinfo', False)
+    _preferred_lang.set(tuple())
+    _preferred_timezone.set(tuple())
     # Clear current translation
-    _current.translation = None
+    _translation.set(None)
     # Clear current timezone
-    _current.tzinfo = None
+    _tzinfo.set(None)
 
 
 def _load_accept_language(**kwargs):
     """
-    When running within a request, load the prefered language from Accept-Language
+    When running within a request, load the preferred language from Accept-Language header.
     """
-
     if cherrypy.request.headers.elements('Accept-Language'):
-        count = 0
-        for x in cherrypy.request.headers.elements('Accept-Language'):
-            _current.preferred_lang.insert(count, x.value.replace('-', '_'))
-            count += 1
-    # Clear current translation
-    _current.translation = None
+        # Sort language by quality
+        languages = sorted(cherrypy.request.headers.elements('Accept-Language'), key=lambda x: x.qvalue, reverse=True)
+        _preferred_lang.set(tuple(lang.value.replace('-', '_') for lang in languages))
+        # Clear current translation
+        _translation.set(None)
+
+
+def _load_cookie_language(**kwargs):
+    """
+    Load preferred language from a request cookie.
+
+    Expected cookie value formats:
+    - en
+    - en_US
+    - en-US
+    """
+    # Skip this step if cookie name is not defined.
+    cookie_name = _get_config('tools.i18n.cookie_name')
+    if not cookie_name:
+        return
+
+    # Check if value defined in cookie.
+    cookie = cherrypy.request.cookie
+    if cookie_name not in cookie:
+        return
+
+    try:
+        value = cookie[cookie_name].value.replace('-', '_')
+    except Exception:
+        return
+
+    # Set preferred language and clear cached translation
+    _preferred_lang.set((value,))
+    _translation.set(None)
 
 
 def _load_func_language(**kwargs):
     """
-    When running a request where a current user is found, load prefered language from user preferences.
+    When running a request where a current user is found, load preferred language from user preferences.
     """
-    func = getattr(cherrypy.request, '_i18n_lang_func', False)
+    func = _get_config('tools.i18n.lang', default=_get_config('tools.i18n.func'))
     if not func:
         return
     try:
@@ -401,16 +472,16 @@ def _load_func_language(**kwargs):
     if not lang:
         return
     # Add custom lang to preferred_lang
-    _current.preferred_lang.insert(0, lang)
+    _preferred_lang.set((lang,))
     # Clear current translation
-    _current.translation = None
+    _translation.set(None)
 
 
 def _load_func_tzinfo(**kwargs):
     """
-    When running a request, load the prefered timezone information from user preferences.
+    When running a request, load the preferred timezone information from user preferences.
     """
-    func = getattr(cherrypy.request, '_i18n_tzinfo_func', False)
+    func = _get_config('tools.i18n.tzinfo')
     if not func:
         return
     try:
@@ -420,9 +491,9 @@ def _load_func_tzinfo(**kwargs):
     if not tzinfo:
         return
     # Add custom lang to preferred_lang
-    _current.preferred_timezone.insert(0, tzinfo)
+    _preferred_timezone.set((tzinfo,))
     # Clear current translation
-    _current.tzinfo = None
+    _tzinfo.set(None)
 
 
 def _set_content_language(**kwargs):
@@ -431,9 +502,12 @@ def _set_content_language(**kwargs):
     language of `cherrypy.response.i18n.locale`.
     """
     if 'Content-Language' not in cherrypy.response.headers:
-        locale = get_translation().locale
-        language_tag = f"{locale.language}-{locale.territory}" if locale.territory else locale.language
-        cherrypy.response.headers['Content-Language'] = language_tag
+        # Only define the content language if the handler uses i18n module.
+        translation = _translation.get()
+        if translation:
+            locale = translation.locale
+            language_tag = f"{locale.language}-{locale.territory}" if locale.territory else locale.language
+            cherrypy.response.headers['Content-Language'] = language_tag
 
 
 class I18nTool(cherrypy.Tool):
@@ -446,6 +520,7 @@ class I18nTool(cherrypy.Tool):
         cherrypy.Tool._setup(self)
         # Attach additional hooks as different priority to update preferred lang with more accurate preferences.
         cherrypy.request.hooks.attach('before_handler', _load_accept_language, priority=60)
+        cherrypy.request.hooks.attach('before_handler', _load_cookie_language, priority=70)
         cherrypy.request.hooks.attach('before_handler', _load_func_language, priority=75)
         cherrypy.request.hooks.attach('before_handler', _load_func_tzinfo, priority=75)
         cherrypy.request.hooks.attach('before_finalize', _set_content_language)

cherrypy_foundation/tools/jinja2.py

@@ -80,7 +80,17 @@ class Jinja2Tool(cherrypy.Tool):
 
         # Enable translation if available
         if hasattr(cherrypy.tools, 'i18n'):
-            from .i18n import format_date, format_datetime, get_language_name, get_translation, ugettext, ungettext
+            from .i18n import (
+                format_date,
+                format_datetime,
+                get_language_name,
+                get_timezone_name,
+                get_translation,
+                list_available_locales,
+                list_available_timezones,
+                ugettext,
+                ungettext,
+            )
 
             env.add_extension('jinja2.ext.i18n')
             env.install_gettext_callables(ugettext, ungettext, newstyle=True)
@@ -88,6 +98,9 @@ class Jinja2Tool(cherrypy.Tool):
             env.filters['format_datetime'] = format_datetime
             env.globals['get_language_name'] = get_language_name
             env.globals['get_translation'] = get_translation
+            env.globals['list_available_locales'] = list_available_locales
+            env.globals['list_available_timezones'] = list_available_timezones
+            env.globals['get_timezone_name'] = get_timezone_name
 
         # Update globals, filters and tests
         env.globals.update(globals)

cherrypy_foundation/tools/tests/templates/test_jinja2.html

@@ -1,4 +1,5 @@
-<html>
+<!DOCTYPE html>
+<html lang="en">
     <head>
         <title>test-jinja2</title>
     </head>

cherrypy_foundation/tools/tests/templates/test_jinjax.html

@@ -1,6 +1,7 @@
-<html>
+<!DOCTYPE html>
+<html lang="en">
     <head>
-        <title>test-jinja2</title>
+        <title>test-jinjax</title>
     </head>
     <body>
         <Button link="http://example.com" label="foo" />

cherrypy_foundation/tools/tests/templates/test_jinjax_i18n.html

@@ -0,0 +1,22 @@
+<!DOCTYPE html>
+<html lang="{{ get_translation().locale }}">
+    <head>
+        <title>test-jinja2</title>
+        {{ catalog.render_assets() }}
+    </head>
+    <body>
+        <!-- Selector -->
+        <div class="dropdown">
+            <button class="btn btn-secondary dropdown-toggle" type="button" data-bs-toggle="dropdown" aria-expanded="false">
+                Dropdown button
+            </button>
+            <ul class="dropdown-menu">
+                <LocaleSelection />
+            </ul>
+        </div>
+        {{ get_language_name(get_translation().locale) }}<br/>
+        {% trans %}Some text to translate{% endtrans %}<br/>
+        {{ my_datetime | format_datetime(format='full') }}<br/>
+        {{ my_date | format_date(format='full') }}
+    </body>
+</html>

cherrypy_foundation/tools/tests/test_i18n.py

@@ -38,7 +38,6 @@ class TestI18n(unittest.TestCase):
     def test_search_translation_en(self):
         # Load default translation return translation
         t = i18n._search_translation(self.mo_dir, 'messages', 'en')
-        self.assertIsInstance(t, gettext.GNUTranslations)
         self.assertEqual("en", t.locale.language)
         # Test translation object
         self.assertEqual(TEXT_EN, t.gettext(TEXT_EN))
@@ -54,7 +53,8 @@ class TestI18n(unittest.TestCase):
     def test_search_translation_invalid(self):
         # Load invalid translation return None
         t = i18n._search_translation(self.mo_dir, 'messages', 'tr')
-        self.assertIsNone(t)
+        # Return Null translations.
+        self.assertIn('NullTranslations', str(t.__class__))
 
 
 class Root:
@@ -76,6 +76,7 @@ class AbstractI18nTest(helper.CPWebCase):
                 'tools.i18n.default': cls.default_lang,
                 'tools.i18n.mo_dir': importlib.resources.files(__package__) / 'locales',
                 'tools.i18n.domain': 'messages',
+                'tools.i18n.cookie_name': 'locale',
             }
         )
         cherrypy.tree.mount(Root(), '/')
@@ -117,6 +118,20 @@ class TestI18nWebCase(AbstractI18nTest):
         self.assertHeaderItemValue("Content-Language", "fr-CA")
         self.assertInBody(TEXT_FR)
 
+    def test_language_en_US_POSIX(self):
+        # When calling with locale variant
+        self.getPage("/", headers=[("Accept-Language", "en-US-POSIX")])
+        self.assertStatus('200 OK')
+        # Tehn page return en-US
+        self.assertHeaderItemValue("Content-Language", "en-US")
+
+    def test_cookie_fr(self):
+        # When calling with locale variant
+        self.getPage("/", headers=[("Accept-Language", "en-US"), ("Cookie", "locale=fr")])
+        self.assertStatus('200 OK')
+        # Tehn page return en-US
+        self.assertHeaderItemValue("Content-Language", "fr")
+
     def test_with_preferred_lang(self):
         # Given a default lang 'en'
         date = datetime.fromtimestamp(1680111611, timezone.utc)
@@ -168,6 +183,23 @@ class TestI18nWebCase(AbstractI18nTest):
             with i18n.preferred_lang('de_CH'):
                 self.assertEqual('29. März 2023, 19:40:11 MESZ', i18n.format_datetime(date, format='long'))
 
+    def test_list_available_locales(self):
+        self.assertEqual(['de', 'en', 'fr'], sorted([str(l) for l in i18n.list_available_locales()]))
+
+    def test_list_available_timezones(self):
+        timezones = i18n.list_available_timezones()
+        self.assertIn('America/Toronto', timezones)
+
+    def test_get_timezone_name(self):
+        with i18n.preferred_lang('en'):
+            self.assertEqual('Eastern Time', i18n.get_timezone_name('America/Toronto'))
+            self.assertEqual('ET', i18n.get_timezone_name('America/Toronto', width='short'))
+            self.assertEqual('Eastern Time', i18n.get_timezone_name('America/Toronto', width='long'))
+        with i18n.preferred_lang('fr'):
+            self.assertEqual('heure de l’Est nord-américain', i18n.get_timezone_name('America/Toronto'))
+            self.assertEqual('HE', i18n.get_timezone_name('America/Toronto', width='short'))
+            self.assertEqual('heure de l’Est nord-américain', i18n.get_timezone_name('America/Toronto', width='long'))
+
 
 class TestI18nDefaultLangWebCase(AbstractI18nTest):
     default_lang = 'FR'

cherrypy_foundation/tools/tests/test_jinja2.py

@@ -21,6 +21,10 @@ import cherrypy
 from cherrypy.test import helper
 from parameterized import parameterized
 
+from cherrypy_foundation.components import StaticMiddleware
+from cherrypy_foundation.tests import SeleniumUnitTest
+from cherrypy_foundation.url import url_for
+
 from .. import i18n  # noqa
 from .. import jinja2  # noqa
 
@@ -38,9 +42,18 @@ def extra_processor():
     return {'var2': 'bar'}
 
 
-@cherrypy.tools.jinja2(env=env, extra_processor=extra_processor)
+@cherrypy.tools.i18n(on=False)
+@cherrypy.tools.sessions(on=False)
+class Static:
+
+    components = StaticMiddleware()
+
+
+@cherrypy.tools.jinja2(on=False, env=env, extra_processor=extra_processor)
 class Root:
 
+    static = Static()
+
     @cherrypy.expose
     @cherrypy.tools.jinja2(template='test_jinja2.html')
     def index(self):
@@ -52,12 +65,13 @@ class Root:
         return {'var1': 'test-jinjax'}
 
     @cherrypy.expose
-    @cherrypy.tools.jinja2(template='test_jinja2_i18n.html')
+    @cherrypy.tools.jinja2(template='test_jinjax_i18n.html')
     @cherrypy.tools.i18n(
         default='fr',
         default_timezone='America/Toronto',
         mo_dir=importlib.resources.files(__package__) / 'locales',
         domain='messages',
+        cookie_name='locale',  # For LocaleSelection
     )
     def localized(self):
         return {
@@ -66,7 +80,7 @@ class Root:
         }
 
 
-class Jinja2Test(helper.CPWebCase):
+class Jinja2Test(helper.CPWebCase, SeleniumUnitTest):
     default_lang = None
     interactive = False
 
@@ -95,6 +109,7 @@ class Jinja2Test(helper.CPWebCase):
         # Then the page is render dynamically using page context
         self.assertInBody('<a class="btn btn-primary" href="http://example.com">foo</a>')
 
+    @skipUnless(HAS_JINJAX, reason='Required jinjax')
     @parameterized.expand(
         [
             ('server_default', {}, 'fr'),
@@ -121,3 +136,18 @@ class Jinja2Test(helper.CPWebCase):
             self.assertInBody('Some text to translate')
             self.assertInBody('Wednesday, November 26, 2025, 6:16:00\u202fAM Eastern Standard Time')
             self.assertInBody('Monday, December 22, 2025')
+
+    @skipUnless(HAS_JINJAX, reason='Required jinjax')
+    def test_get_page_i18n_selenium(self):
+        # Given a localized page render with jinja2
+        with self.selenium() as driver:
+            # When querying the page
+            driver.get(url_for('localized'))
+            # Then page load without error in english (enforced chronium lang)
+            self.assertFalse(driver.get_log('browser'))
+            self.assertEqual('en_US', driver.find_element('css selector', 'html').get_attribute('lang'))
+            # When user select a language
+            btn = driver.find_element('css selector', 'button[data-locale=fr]')
+            btn.click()
+            # Then page is reloaded with in French.
+            self.assertEqual('fr', driver.find_element('css selector', 'html').get_attribute('lang'))

cherrypy_foundation/url.py

@@ -60,8 +60,7 @@ def url_for(*args, _relative=None, _base=None, **kwargs):
     elif not path.startswith('.'):
         path = urljoin('/', path)
     # Outside a request, use cherrypy.tools.proxy config
-    if not cherrypy.request.app:
-        if _base is None:
-            _base = cherrypy.config.get('tools.proxy.base', None)
+    if not cherrypy.request.app and _base is None:
+        _base = cherrypy.config.get('tools.proxy.base', None)
     # Use cherrypy to build the URL
     return cherrypy.url(path=path, qs=qs, relative=_relative, base=_base)

{cherrypy_foundation-1.0.0a12.dist-info → cherrypy_foundation-1.0.0a14.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cherrypy-foundation
-Version: 1.0.0a12
+Version: 1.0.0a14
 Summary: CherryPy Foundation
 Author-email: Patrik Dufresne <patrik@ikus-soft.com>
 License: GPLv3

{cherrypy_foundation-1.0.0a12.dist-info → cherrypy_foundation-1.0.0a14.dist-info}/RECORD

@@ -4,9 +4,9 @@ cherrypy_foundation/flash.py,sha256=fFRbutUX6c1lVHqjehmO9y98dJgmfNCjhd76t2mth2s,
 cherrypy_foundation/form.py,sha256=8c9dO0o47sK3CBosTkGXoVRtzNQwY0aw0vNZfTqmhvo,3994
 cherrypy_foundation/logging.py,sha256=YIOK5ZAZLCv52YDdP66yBYpEX1C336JnI3wnrTKl1Lw,3468
 cherrypy_foundation/passwd.py,sha256=ZGdrBNKtLP75l01W6VEd8cIjSQ3guJ_YVPEfbSew7T0,2144
-cherrypy_foundation/url.py,sha256=l11A4MYTwTAPrGYXygkpibx_eYAYfVbbq-IrlePgg4U,2866
+cherrypy_foundation/url.py,sha256=IjDADMIZTZbQ5mECSsoz_MsyJvA85amV-93J_E3hbb4,2854
 cherrypy_foundation/widgets.py,sha256=0B5Y2V6x5Ufl6ExR3tc0Olrzj7N4TAAOtqGq_MUxBG0,1549
-cherrypy_foundation/components/ColorModes.jinja,sha256=8MzkeZsra1wtIdiaQKc7UQUbMfRMUlmM6e9X7V1vfq0,3501
+cherrypy_foundation/components/ColorModes.jinja,sha256=Ai2fy1qHFwEgutvyvvGjKJmffcBdNb7wmY20DJqZ8R4,3528
 cherrypy_foundation/components/Datatable.css,sha256=7wSwgdA61vYCdEuQ0bp2o0oSvu5mGLN1c6ovCUSe718,947
 cherrypy_foundation/components/Datatable.jinja,sha256=K-24vpN5TO8Jk2COvuC5uBaCj3PFLd6ubr28JHFq3KM,3375
 cherrypy_foundation/components/Datatable.js,sha256=jiV78bJPNMTLcjrX03vaYcsEdRbI6ctzSvCo880H8Hw,12072
@@ -16,6 +16,8 @@ cherrypy_foundation/components/Field.js,sha256=SFixZ62WlLq7SSCEazMAGhSnc9EnQ1wg6
 cherrypy_foundation/components/Fields.jinja,sha256=_8Or6DOlciKjRao-sdBpLs--bx5V-K80X3hDEA1VKCQ,165
 cherrypy_foundation/components/Flash.jinja,sha256=COy44drQsXpbZajjJS4w_9NMPYFdMfUNdfhd7SbFdYA,442
 cherrypy_foundation/components/Icon.jinja,sha256=Z1RGYBg5xlDEoUy3glqb_k_LEjkJHeCxQXqDEvWzEF4,135
+cherrypy_foundation/components/LocaleSelection.jinja,sha256=NHhQGI6CCJl4LWl-eteu_AIg1_qc1MusuA1fKcrjluQ,509
+cherrypy_foundation/components/LocaleSelection.js,sha256=-iTZD5ejg1R9F3tZASTH7dkgd19upke-pzOhsZ9K_LA,670
 cherrypy_foundation/components/SideBySideMultiSelect.css,sha256=_poMY9O8rvDsOh01pQLf9qtg1Gm4eCM2HsM_ekC5zkk,503
 cherrypy_foundation/components/SideBySideMultiSelect.jinja,sha256=sud1WP-6JzuP7ZLRr-JQqvgMRWZRlXvxUJfguFr_klk,478
 cherrypy_foundation/components/SideBySideMultiSelect.js,sha256=5YMz1pgkXeWC_SRRfDbQI3X-c4PuxiTIpbWJt9sY7Rc,197
@@ -91,43 +93,41 @@ cherrypy_foundation/plugins/tests/test_ldap.py,sha256=j0QUIxqeEBgN4VLvczUlw0xMM_
 cherrypy_foundation/plugins/tests/test_scheduler.py,sha256=I-ZuQhMvCCvqFDwukwsyz_UkdJJ8JSLTkAanUo24GCE,3564
 cherrypy_foundation/plugins/tests/test_scheduler_db.py,sha256=-iZnLgb3qsJzs0p7JAw6TQswRtExCmHAtYXqRNPZn7U,3101
 cherrypy_foundation/plugins/tests/test_smtp.py,sha256=qs5yezIpSXkBmLmFlqckfPW7NmntHZxQjDSkdQG_dNE,4183
-cherrypy_foundation/tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+cherrypy_foundation/tests/__init__.py,sha256=VIBhEMPDIaffF7lYzA5KevcVNzALz4kykBBaO-gdKHY,2818
 cherrypy_foundation/tests/test_error_page.py,sha256=8yLK8OGbJIdUjilFIHMNBZadLKHrXnD6KSmQ3Da4LaQ,2399
 cherrypy_foundation/tests/test_flash.py,sha256=JqZDAgazlNnP3HcPFmFOWbPeDDMzc6z5fHNe-pBTin0,1976
 cherrypy_foundation/tests/test_form.py,sha256=sWsPWyXwAVkCeP5t0qIHc0Oi32Zi3kztoQ_wlDR9STc,4326
 cherrypy_foundation/tests/test_passwd.py,sha256=gC5O4yhHyU1YRYuDc0pG0T_5zvrG2qrr6P822iyK3Rg,1956
 cherrypy_foundation/tests/test_url.py,sha256=W-RTKQuxYS2KXxCYTTtnKcxfdP9F6Fp3QKY_sBTnBmE,6434
-cherrypy_foundation/tests/templates/test_flash.html,sha256=MyOPsHQX97TB30sbKrbG3tagKDyvV8OVKp-UOrw7REc,187
-cherrypy_foundation/tests/templates/test_form.html,sha256=sm-n2cYvih2vbDE4Y8kkERSoulnKAbwoefbzBggMMnA,189
-cherrypy_foundation/tests/templates/test_url.html,sha256=Rb6NokHEduMHAXO8P6EduMMHXuNzJGN5Of2OF4fSWns,502
+cherrypy_foundation/tests/templates/test_flash.html,sha256=b1S4I9v0n-Y1yoTUh2ZKNysR1NMrqv8ldvqONtmInzw,213
+cherrypy_foundation/tests/templates/test_form.html,sha256=ywaLKgWqvBdbdfnBgYmi1ihA3xK8X5YtjomA6atnJUg,206
+cherrypy_foundation/tests/templates/test_url.html,sha256=427G6AnA6zUfjPoLxsVHy3U2e_XxG4ntpZX3DIjO18Q,512
 cherrypy_foundation/tools/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 cherrypy_foundation/tools/auth.py,sha256=lTSajxCiReMzm-Fl-xhTByi4yFnInEWOoNsmUMnHQhs,9761
 cherrypy_foundation/tools/auth_mfa.py,sha256=VaLvBz9wo6jTx-2mCGqFXPxl-z14f8UMWvd6_xeXd40,9212
 cherrypy_foundation/tools/errors.py,sha256=ELpAj0N9kIxC22QW5xDQJz60zMpCwgm-Twu2WpELM1A,1005
-cherrypy_foundation/tools/i18n.py,sha256=VQJs7hIv-BM9_FIU6-pwRp65eeroHoQLU7QrV5V_rbI,14641
-cherrypy_foundation/tools/jinja2.py,sha256=nppYnk2ASDsyfNHF9m83W4foiN3MhcwDJvo5baEgnGU,5520
+cherrypy_foundation/tools/i18n.py,sha256=pP3QrGCHiNHVDpjdKNFKErOCm3eRYZL6W_nlz9j8eD8,17128
+cherrypy_foundation/tools/jinja2.py,sha256=xrHfk814GjlWhfqJcXTA6I2PQ3YqsSz4eHcCh9sG05U,5969
 cherrypy_foundation/tools/ratelimit.py,sha256=pT7vZRmjltNeuiQpdyXOmnpG9BcXjLaj-AXJ0e2x_zw,8300
 cherrypy_foundation/tools/secure_headers.py,sha256=Yh-iA_Js4MUsx5nq4ilbc-iWy90ZC0oMb3TJJD_UwYo,3921
 cherrypy_foundation/tools/sessions_timeout.py,sha256=6iBWJntPMk_Qt94fBSfBISf1IXInSh-1XrxLbKXFV-g,7408
 cherrypy_foundation/tools/tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 cherrypy_foundation/tools/tests/test_auth.py,sha256=oeM5t38M8DUC9dYn59dcf00jdGY6Ry0jZWhQd_PYQUk,2847
 cherrypy_foundation/tools/tests/test_auth_mfa.py,sha256=911hnBbdg5CKb613uIBrlggoTAyBU9SoL7Sxd-tIKS0,15008
-cherrypy_foundation/tools/tests/test_i18n.py,sha256=T9j9fF7AwH_H4TJnC4CbAOS1a1D2Z4xPxaOmiP0By34,9091
-cherrypy_foundation/tools/tests/test_jinja2.py,sha256=_dkRJpjB0ybDV6YO0uEFFO8LAcWgVu3VBB8_vWthQ48,4296
+cherrypy_foundation/tools/tests/test_i18n.py,sha256=9rK4_1HVTk2dtTh9egIymx4SP8EO8_igBQkCD4YiIys,10758
+cherrypy_foundation/tools/tests/test_jinja2.py,sha256=gLwaGeQn1Wt7Ximc_5ESHSm499vCeyqhEhPYUPJnamk,5545
 cherrypy_foundation/tools/tests/test_ratelimit.py,sha256=rrqybwMbh1GFlF2-Ut57zHPAc1uqX88aqea6VS_6p5E,3449
 cherrypy_foundation/tools/tests/components/Button.jinja,sha256=uSLp1GpEIgZNXK_GWglu0E_a1c3jHpDLI66MRfMqGhE,95
 cherrypy_foundation/tools/tests/locales/messages.pot,sha256=5K9piTRL7H5MxDXFIWJsCccSJRA0HwfCQQU8b8VYo30,40
 cherrypy_foundation/tools/tests/locales/de/LC_MESSAGES/messages.mo,sha256=bsJTVL4OefevkxeHDS3VcW3egP6Yq18LFXwjSyoqIng,336
 cherrypy_foundation/tools/tests/locales/de/LC_MESSAGES/messages.po,sha256=glzYY96jmCaGyxYtMqmNF-1q-OYWXBIkMysvbXO4L6E,351
-cherrypy_foundation/tools/tests/locales/en/LC_MESSAGES/messages.mo,sha256=cdyG2Js1TIU6eenDX1ICH8uP45yvl0OLN0-SMUXTBa4,259
-cherrypy_foundation/tools/tests/locales/en/LC_MESSAGES/messages.po,sha256=JCpiRLLHUSYQhzta8ZYjfB50NmpwPGNCTNwo2Glww14,322
 cherrypy_foundation/tools/tests/locales/fr/LC_MESSAGES/messages.mo,sha256=u3_kl_nqZ3FNaSyKVQKmu4KJzN3xOxxJNVmcdhw37jA,327
 cherrypy_foundation/tools/tests/locales/fr/LC_MESSAGES/messages.po,sha256=6_Sk9Igqm7dtpyyS701p5qc4DvOJE7TRT0ajRZctFAQ,342
-cherrypy_foundation/tools/tests/templates/test_jinja2.html,sha256=v9AHxksbBvzE7sesPqE61HMhsvU4juXt3E0ZQo-zXVQ,190
-cherrypy_foundation/tools/tests/templates/test_jinja2_i18n.html,sha256=98S51dgG7Vb4rvMZNZvomw1D9pBiM4g6pdlxAgvrxXA,373
-cherrypy_foundation/tools/tests/templates/test_jinjax.html,sha256=NT19UaUzm8FRKOIc6H6HNGPDJU6KATnakd8zf3BCeAs,153
-cherrypy_foundation-1.0.0a12.dist-info/licenses/LICENSE.md,sha256=trSLYs5qlaow_bBwsLTRKpmTXsXzFksM_YUCMqrgAJQ,35149
-cherrypy_foundation-1.0.0a12.dist-info/METADATA,sha256=bVj-ivyQaks7eDS4cxGDbq0I1OhKXejr5Rq9EUo81xc,2023
-cherrypy_foundation-1.0.0a12.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-cherrypy_foundation-1.0.0a12.dist-info/top_level.txt,sha256=B1vQPTLYhpKJ6W0JkRCWyAf8RPcnwJWdYxixv75-4ew,20
-cherrypy_foundation-1.0.0a12.dist-info/RECORD,,
+cherrypy_foundation/tools/tests/templates/test_jinja2.html,sha256=s1bHmy-lyf0YW0t-LOx3ugILV2kqFoBNYxziWgrZbo0,216
+cherrypy_foundation/tools/tests/templates/test_jinjax.html,sha256=NImzIW0mUHxilFd61PSoxFC-yu1nayEVwv-5zlgD9yo,179
+cherrypy_foundation/tools/tests/templates/test_jinjax_i18n.html,sha256=yre8j7HBjpTQZHpM0PuB3ASGD3O4vKkJ-y72Fm6STgY,771
+cherrypy_foundation-1.0.0a14.dist-info/licenses/LICENSE.md,sha256=trSLYs5qlaow_bBwsLTRKpmTXsXzFksM_YUCMqrgAJQ,35149
+cherrypy_foundation-1.0.0a14.dist-info/METADATA,sha256=4Iv0mZTcV0ApGQk9UOB0tiTopgR_J7FG31KifV9nl0E,2023
+cherrypy_foundation-1.0.0a14.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+cherrypy_foundation-1.0.0a14.dist-info/top_level.txt,sha256=B1vQPTLYhpKJ6W0JkRCWyAf8RPcnwJWdYxixv75-4ew,20
+cherrypy_foundation-1.0.0a14.dist-info/RECORD,,

cherrypy_foundation/tools/tests/locales/en/LC_MESSAGES/messages.po

@@ -1,15 +0,0 @@
-msgid ""
-msgstr ""
-"Project-Id-Version: \n"
-"POT-Creation-Date: \n"
-"PO-Revision-Date: \n"
-"Last-Translator: \n"
-"Language-Team: \n"
-"Language: en\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 3.6\n"
-
-msgid "Some text to translate"
-msgstr ""

cherrypy_foundation/tools/tests/templates/test_jinja2_i18n.html

@@ -1,11 +0,0 @@
-<html lang="{{ get_translation().locale }}">
-    <head>
-        <title>test-jinja2</title>
-    </head>
-    <body>
-        {{ get_language_name(get_translation().locale) }}<br/>
-        {% trans %}Some text to translate{% endtrans %}<br/>
-        {{ my_datetime | format_datetime(format='full') }}<br/>
-        {{ my_date | format_date(format='full') }}
-    </body>
-</html>