cherrypy-foundation 1.0.0a8__tar.gz → 1.0.0a9__tar.gz

{cherrypy_foundation-1.0.0a8/src/cherrypy_foundation.egg-info → cherrypy_foundation-1.0.0a9}/PKG-INFO

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

{cherrypy_foundation-1.0.0a8 → cherrypy_foundation-1.0.0a9}/src/cherrypy_foundation/components/Field.jinja

@@ -1,4 +1,6 @@
 {# def field, floating=False #}
+{#css vendor/bootstrap5/css/bootstrap.min.css #}
+{#js vendor/jquery/jquery.min.js, vendor/popper/popper.min.js, vendor/bootstrap5/js/bootstrap.min.js #}
 {# djlint:off #}
 {% set bootstrap_class_table = {
   "CheckboxInput": ("form-check-input", "form-check-label", False, True),

{cherrypy_foundation-1.0.0a8 → cherrypy_foundation-1.0.0a9}/src/cherrypy_foundation/components/Fields.jinja

@@ -1,6 +1,4 @@
 {# def form, floating=False #}
-{#css vendor/bootstrap5/css/bootstrap.min.css #}
-{#js vendor/jquery/jquery.min.js, vendor/popper/popper.min.js, vendor/bootstrap5/js/bootstrap.min.js #}
 <div class="row">
   {% for id, field in form._fields.items() %}<Field field={{ field }} floating={{ floating }} />{% endfor %}
 </div>

{cherrypy_foundation-1.0.0a8 → cherrypy_foundation-1.0.0a9}/src/cherrypy_foundation/tools/i18n.py

@@ -162,7 +162,7 @@ def preferred_timezone(timezone):
 
 
 @lru_cache(maxsize=10)
-def _search_translation(dirname, domain, *langs):
+def _search_translation(dirname, domain, *locales):
     """
     Loads the first existing translations for known locale.
 
@@ -177,15 +177,19 @@ def _search_translation(dirname, domain, *langs):
 
     :returns: Translations, the corresponding Locale object.
     """
-    if not isinstance(langs, (list, tuple)):
-        langs = [langs]
-    t = Translations.load(dirname, langs, domain)
+    if not isinstance(locales, (list, tuple)):
+        locales = [locales]
+    t = Translations.load(dirname, locales, domain)
     # Ignore null translation
     if t.__class__ is NullTranslations:
         return None
-    # Get Locale from file name
-    lang = t.files[0].split('/')[-3]
-    t.locale = Locale.parse(lang)
+    # Assign prefered local to this translation to know the current locale.
+    trans_locale = Locale.parse(t.files[0].split('/')[-3])
+    for locale in locales:
+        locale = Locale.parse(locale)
+        if trans_locale == locale or trans_locale.language == locale.language:
+            t.locale = locale
+            break
     return t
 
 
@@ -424,7 +428,9 @@ def _set_content_language(**kwargs):
     language of `cherrypy.response.i18n.locale`.
     """
     if 'Content-Language' not in cherrypy.response.headers:
-        cherrypy.response.headers['Content-Language'] = str(get_translation().locale)
+        locale = get_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):

cherrypy_foundation-1.0.0a9/src/cherrypy_foundation/tools/tests/locales/de/LC_MESSAGES/messages.po

@@ -0,0 +1,15 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: \n"
+"POT-Creation-Date: \n"
+"PO-Revision-Date: \n"
+"Last-Translator: \n"
+"Language-Team: \n"
+"Language: de\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 "Einige zu übersetzende Texte"

{cherrypy_foundation-1.0.0a8 → cherrypy_foundation-1.0.0a9}/src/cherrypy_foundation/tools/tests/test_i18n.py

@@ -83,6 +83,13 @@ class AbstractI18nTest(helper.CPWebCase):
 
 class TestI18nWebCase(AbstractI18nTest):
 
+    def test_language_with_invalid(self):
+        #  Query the page without login-in
+        self.getPage("/", headers=[("Accept-Language", "invalid")])
+        self.assertStatus('200 OK')
+        self.assertHeaderItemValue("Content-Language", "en")
+        self.assertInBody(TEXT_EN)
+
     def test_language_with_unknown(self):
         #  Query the page without login-in
         self.getPage("/", headers=[("Accept-Language", "it")])
@@ -93,13 +100,13 @@ class TestI18nWebCase(AbstractI18nTest):
     def test_language_en(self):
         self.getPage("/", headers=[("Accept-Language", "en-US,en;q=0.8")])
         self.assertStatus('200 OK')
-        self.assertHeaderItemValue("Content-Language", "en")
+        self.assertHeaderItemValue("Content-Language", "en-US")
         self.assertInBody(TEXT_EN)
 
     def test_language_en_fr(self):
         self.getPage("/", headers=[("Accept-Language", "en-US,en;q=0.8,fr-CA;q=0.8")])
         self.assertStatus('200 OK')
-        self.assertHeaderItemValue("Content-Language", "en")
+        self.assertHeaderItemValue("Content-Language", "en-US")
         self.assertInBody(TEXT_EN)
 
     def test_language_fr(self):
@@ -107,7 +114,7 @@ class TestI18nWebCase(AbstractI18nTest):
         self.assertInBody(TEXT_EN)
         self.getPage("/", headers=[("Accept-Language", "fr-CA;q=0.8,fr;q=0.6")])
         self.assertStatus('200 OK')
-        self.assertHeaderItemValue("Content-Language", "fr")
+        self.assertHeaderItemValue("Content-Language", "fr-CA")
         self.assertInBody(TEXT_FR)
 
     def test_with_preferred_lang(self):
@@ -125,6 +132,42 @@ class TestI18nWebCase(AbstractI18nTest):
         self.assertEqual(TEXT_EN, i18n.ugettext(TEXT_EN))
         self.assertIn('March', i18n.format_datetime(date, format='long'))
 
+    def test_format_datetime_locales(self):
+        date = datetime.fromtimestamp(1680111611, timezone.utc)
+        with i18n.preferred_timezone('utc'):
+            with i18n.preferred_lang('fr'):
+                self.assertEqual('29 mars 2023, 17:40:11 TU', i18n.format_datetime(date, format='long'))
+            with i18n.preferred_lang('en'):
+                self.assertEqual('March 29, 2023, 5:40:11\u202fPM UTC', i18n.format_datetime(date, format='long'))
+            with i18n.preferred_lang('en_US'):
+                self.assertEqual('March 29, 2023, 5:40:11\u202fPM UTC', i18n.format_datetime(date, format='long'))
+            with i18n.preferred_lang('en_GB'):
+                self.assertEqual('29 March 2023, 17:40:11 UTC', i18n.format_datetime(date, format='long'))
+            with i18n.preferred_lang('en_CH'):
+                self.assertEqual('29 March 2023, 17:40:11 UTC', i18n.format_datetime(date, format='long'))
+            with i18n.preferred_lang('de'):
+                self.assertEqual('29. März 2023, 17:40:11 UTC', i18n.format_datetime(date, format='long'))
+            with i18n.preferred_lang('de_CH'):
+                self.assertEqual('29. März 2023, 17:40:11 UTC', i18n.format_datetime(date, format='long'))
+
+        with i18n.preferred_timezone('CET'):
+            with i18n.preferred_lang('fr'):
+                self.assertEqual('29 mars 2023, 19:40:11 +0200', i18n.format_datetime(date, format='long'))
+            with i18n.preferred_lang('fr_CH'):
+                self.assertEqual('29 mars 2023, 19:40:11 +0200', i18n.format_datetime(date, format='long'))
+            with i18n.preferred_lang('en'):
+                self.assertEqual('March 29, 2023, 7:40:11\u202fPM +0200', i18n.format_datetime(date, format='long'))
+            with i18n.preferred_lang('en_US'):
+                self.assertEqual('March 29, 2023, 7:40:11\u202fPM +0200', i18n.format_datetime(date, format='long'))
+            with i18n.preferred_lang('en_GB'):
+                self.assertEqual('29 March 2023, 19:40:11 CEST', i18n.format_datetime(date, format='long'))
+            with i18n.preferred_lang('en_CH'):
+                self.assertEqual('29 March 2023, 19:40:11 CEST', i18n.format_datetime(date, format='long'))
+            with i18n.preferred_lang('de'):
+                self.assertEqual('29. März 2023, 19:40:11 MESZ', i18n.format_datetime(date, format='long'))
+            with i18n.preferred_lang('de_CH'):
+                self.assertEqual('29. März 2023, 19:40:11 MESZ', i18n.format_datetime(date, format='long'))
+
 
 class TestI18nDefaultLangWebCase(AbstractI18nTest):
     default_lang = 'FR'

{cherrypy_foundation-1.0.0a8 → cherrypy_foundation-1.0.0a9/src/cherrypy_foundation.egg-info}/PKG-INFO

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

{cherrypy_foundation-1.0.0a8 → cherrypy_foundation-1.0.0a9}/src/cherrypy_foundation.egg-info/SOURCES.txt

@@ -138,6 +138,8 @@ src/cherrypy_foundation/tools/tests/test_jinja2.py
 src/cherrypy_foundation/tools/tests/test_ratelimit.py
 src/cherrypy_foundation/tools/tests/components/Button.jinja
 src/cherrypy_foundation/tools/tests/locales/messages.pot
+src/cherrypy_foundation/tools/tests/locales/de/LC_MESSAGES/messages.mo
+src/cherrypy_foundation/tools/tests/locales/de/LC_MESSAGES/messages.po
 src/cherrypy_foundation/tools/tests/locales/en/LC_MESSAGES/messages.mo
 src/cherrypy_foundation/tools/tests/locales/en/LC_MESSAGES/messages.po
 src/cherrypy_foundation/tools/tests/locales/fr/LC_MESSAGES/messages.mo