From 595738296faec582ce90f1cffef90fbb9b18384b Mon Sep 17 00:00:00 2001 From: Adam Johnson Date: Sat, 24 Feb 2024 19:58:12 +0000 Subject: [PATCH] Refs #26431 -- Added more test for translated path(). --- .../patterns/locale/en/LC_MESSAGES/django.mo | Bin 610 -> 550 bytes .../patterns/locale/en/LC_MESSAGES/django.po | 20 ++++++++++++------ .../patterns/locale/nl/LC_MESSAGES/django.mo | Bin 711 -> 761 bytes .../patterns/locale/nl/LC_MESSAGES/django.po | 18 ++++++++++------ .../locale/pt_BR/LC_MESSAGES/django.mo | Bin 655 -> 707 bytes .../locale/pt_BR/LC_MESSAGES/django.po | 18 ++++++++++------ tests/i18n/patterns/tests.py | 14 +++++++++++- tests/i18n/patterns/urls/default.py | 8 ++++++- 8 files changed, 56 insertions(+), 22 deletions(-) diff --git a/tests/i18n/patterns/locale/en/LC_MESSAGES/django.mo b/tests/i18n/patterns/locale/en/LC_MESSAGES/django.mo index bca387b04c6bd88f458d6f933c6d359e4a23a150..b1f63b1031066b1dc09b86e57f6ad3545dbfed72 100644 GIT binary patch delta 145 zcmaFFvW%tvo)F7a1|VPsVi_QI0b+I_&H-W&=m26)AnpWWZXliv#BxA9ABZ`Ccpnfe zFfuS42ht#QFMw>2x=%nFr0yS(2C0)}VqgF=!GIY^vH&sAP9_GXi3_zh-i&9QcvA)d DhMf?l delta 177 zcmZ3+@`$DWo)F7a1|VPqVi_Rz0b*_-t^r~YSOLVGK)e!&LE@W%m=}om1F;+sp9NwL zAbtbH3XBX4Ux748y%-Zjy#kO1sn-G0AoW&28l*lFNCTBCF#u^WU;&cMK+Fo^f*k~A PPHfcLI5(GZ;#@5N4UiBt diff --git a/tests/i18n/patterns/locale/en/LC_MESSAGES/django.po b/tests/i18n/patterns/locale/en/LC_MESSAGES/django.po index 4e609f038ef..ac98eb5f08a 100644 --- a/tests/i18n/patterns/locale/en/LC_MESSAGES/django.po +++ b/tests/i18n/patterns/locale/en/LC_MESSAGES/django.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-02-28 11:48+0000\n" +"POT-Creation-Date: 2024-03-01 21:18+0000\n" "PO-Revision-Date: 2011-06-14 16:16+0100\n" "Last-Translator: Jannis Leidel \n" "Language-Team: LANGUAGE \n" @@ -17,22 +17,30 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" #: urls/default.py:11 -msgid "^translated/$" +#, fuzzy +#| msgid "^translated/$" +msgid "translated/" msgstr "^translated/$" -#: urls/default.py:13 +#: urls/default.py:12 +#, fuzzy +#| msgid "^translated/$" +msgid "^translated-regex/$" +msgstr "^translated/$" + +#: urls/default.py:14 msgid "^translated/(?P[\\w-]+)/$" msgstr "^translated/(?P[\\w-]+)/$" -#: urls/default.py:24 +#: urls/default.py:25 msgid "^with-arguments/(?P[\\w-]+)/(?:(?P[\\w-]+).html)?$" msgstr "" -#: urls/default.py:28 +#: urls/default.py:29 msgid "^users/$" msgstr "^users/$" -#: urls/default.py:30 urls/wrong.py:7 +#: urls/default.py:31 urls/wrong.py:7 msgid "^account/" msgstr "^account/" diff --git a/tests/i18n/patterns/locale/nl/LC_MESSAGES/django.mo b/tests/i18n/patterns/locale/nl/LC_MESSAGES/django.mo index 730462386e1ceabfc172d704a7badce2df169334..544bfdbfc664507780f671e9571670d4cf2e89c4 100644 GIT binary patch delta 246 zcmXZVu@1pd6oBE=YMZK%C??_!8nc1L<{2zadSeliYQ$#gENR5XBZ$F6AhFpx@CXKz z&40y7zWg`0_oQe0W3L{*wH3xi3nP@UgPseDxI*9GQNt5$yrFk}L!?TZRKE-85MAi~ z)D)@EHP!F-l>hbR$f3-|jn-*S^}>s?D?}{lDZu`nL>%g7hrkJ9HCD?k?|DfaPUn*_ YQPHVk%#8n+O==Fjg^H6foJ1Y@0{lcGQ2+n{ delta 194 zcmey#dYrZXo)F7a1|VPuVi_O~0b*_-?g3&D*a5_xK)e%(LE?vjm=}o81F;+s-vwe0 zApQfyfIQ>+0zcBf#&EjECDh^fC8I\n" "Language-Team: LANGUAGE \n" @@ -18,22 +18,26 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1)\n" #: urls/default.py:11 -msgid "^translated/$" -msgstr "^vertaald/$" +msgid "translated/" +msgstr "vertaald/" -#: urls/default.py:13 +#: urls/default.py:12 +msgid "^translated-regex/$" +msgstr "^vertaald-regex/$" + +#: urls/default.py:14 msgid "^translated/(?P[\\w-]+)/$" msgstr "^vertaald/(?P[\\w-]+)/$" -#: urls/default.py:24 +#: urls/default.py:25 msgid "^with-arguments/(?P[\\w-]+)/(?:(?P[\\w-]+).html)?$" msgstr "" -#: urls/default.py:28 +#: urls/default.py:29 msgid "^users/$" msgstr "^gebruikers/$" -#: urls/default.py:30 urls/wrong.py:7 +#: urls/default.py:31 urls/wrong.py:7 msgid "^account/" msgstr "^profiel/" diff --git a/tests/i18n/patterns/locale/pt_BR/LC_MESSAGES/django.mo b/tests/i18n/patterns/locale/pt_BR/LC_MESSAGES/django.mo index 431a4016dfa814666615dd01651de133e2025840..8e36cb206409c512c1bb8d7031e79112d4c76914 100644 GIT binary patch delta 232 zcmeBYJ;Pg;Al?bYAo0UMEDXfwfmjZR9|JK5 z5Hm4Cz8AYKW?Ao0yW%nQW(fmjZR&jK+A z5WfLpPeulYuRxj|i0zpe82Es+JCFvc4+GL5^(jCaWKJ`X1}c|h0McN<0wkG%m=(eW XJBVT8THT2cv^R@0<}gm~WYPlwSIrVK diff --git a/tests/i18n/patterns/locale/pt_BR/LC_MESSAGES/django.po b/tests/i18n/patterns/locale/pt_BR/LC_MESSAGES/django.po index 6874b2d028b..464d14bc1f7 100644 --- a/tests/i18n/patterns/locale/pt_BR/LC_MESSAGES/django.po +++ b/tests/i18n/patterns/locale/pt_BR/LC_MESSAGES/django.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-02-28 11:48+0000\n" +"POT-Creation-Date: 2024-03-01 21:18+0000\n" "PO-Revision-Date: 2011-06-14 16:17+0100\n" "Last-Translator: Jannis Leidel \n" "Language-Team: LANGUAGE \n" @@ -18,22 +18,26 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n > 1)\n" #: urls/default.py:11 -msgid "^translated/$" -msgstr "^traduzidos/$" +msgid "translated/" +msgstr "traduzidos/" -#: urls/default.py:13 +#: urls/default.py:12 +msgid "^translated-regex/$" +msgstr "^traduzidos-regex/$" + +#: urls/default.py:14 msgid "^translated/(?P[\\w-]+)/$" msgstr "^traduzidos/(?P[\\w-]+)/$" -#: urls/default.py:24 +#: urls/default.py:25 msgid "^with-arguments/(?P[\\w-]+)/(?:(?P[\\w-]+).html)?$" msgstr "" -#: urls/default.py:28 +#: urls/default.py:29 msgid "^users/$" msgstr "^usuarios/$" -#: urls/default.py:30 urls/wrong.py:7 +#: urls/default.py:31 urls/wrong.py:7 msgid "^account/" msgstr "^conta/" diff --git a/tests/i18n/patterns/tests.py b/tests/i18n/patterns/tests.py index e2fee904b14..bd329e69f8e 100644 --- a/tests/i18n/patterns/tests.py +++ b/tests/i18n/patterns/tests.py @@ -134,6 +134,9 @@ class URLTranslationTests(URLTestCaseBase): def test_no_prefix_translated(self): with translation.override("en"): self.assertEqual(reverse("no-prefix-translated"), "/translated/") + self.assertEqual( + reverse("no-prefix-translated-regex"), "/translated-regex/" + ) self.assertEqual( reverse("no-prefix-translated-slug", kwargs={"slug": "yeah"}), "/translated/yeah/", @@ -141,6 +144,7 @@ class URLTranslationTests(URLTestCaseBase): with translation.override("nl"): self.assertEqual(reverse("no-prefix-translated"), "/vertaald/") + self.assertEqual(reverse("no-prefix-translated-regex"), "/vertaald-regex/") self.assertEqual( reverse("no-prefix-translated-slug", kwargs={"slug": "yeah"}), "/vertaald/yeah/", @@ -148,6 +152,9 @@ class URLTranslationTests(URLTestCaseBase): with translation.override("pt-br"): self.assertEqual(reverse("no-prefix-translated"), "/traduzidos/") + self.assertEqual( + reverse("no-prefix-translated-regex"), "/traduzidos-regex/" + ) self.assertEqual( reverse("no-prefix-translated-slug", kwargs={"slug": "yeah"}), "/traduzidos/yeah/", @@ -180,7 +187,7 @@ class URLTranslationTests(URLTestCaseBase): "/nl/profiel/registreren-als-pad/", ) self.assertEqual(translation.get_language(), "en") - # URL with parameters. + # re_path() URL with parameters. self.assertEqual( translate_url("/en/with-arguments/regular-argument/", "nl"), "/nl/with-arguments/regular-argument/", @@ -191,6 +198,11 @@ class URLTranslationTests(URLTestCaseBase): ), "/nl/with-arguments/regular-argument/optional.html", ) + # path() URL with parameter. + self.assertEqual( + translate_url("/en/path-with-arguments/regular-argument/", "nl"), + "/nl/path-with-arguments/regular-argument/", + ) with translation.override("nl"): self.assertEqual(translate_url("/nl/gebruikers/", "en"), "/en/users/") diff --git a/tests/i18n/patterns/urls/default.py b/tests/i18n/patterns/urls/default.py index 418e9f56856..090b92eeca6 100644 --- a/tests/i18n/patterns/urls/default.py +++ b/tests/i18n/patterns/urls/default.py @@ -8,7 +8,8 @@ view = TemplateView.as_view(template_name="dummy.html") urlpatterns = [ path("not-prefixed/", view, name="not-prefixed"), path("not-prefixed-include/", include("i18n.patterns.urls.included")), - re_path(_(r"^translated/$"), view, name="no-prefix-translated"), + path(_("translated/"), view, name="no-prefix-translated"), + re_path(_(r"^translated-regex/$"), view, name="no-prefix-translated-regex"), re_path( _(r"^translated/(?P[\w-]+)/$"), view, @@ -25,6 +26,11 @@ urlpatterns += i18n_patterns( view, name="with-arguments", ), + path( + _("path-with-arguments//"), + view, + name="path-with-arguments", + ), re_path(_(r"^users/$"), view, name="users"), re_path( _(r"^account/"), include("i18n.patterns.urls.namespace", namespace="account")