mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-08-11 04:19:11 +00:00
Code Issues 32 Releases Wiki Activity

Refs #26431 -- Added more test for translated path().

Browse Source
This commit is contained in:
Adam Johnson 2024-02-24 19:58:12 +00:00 committed by Mariusz Felisiak
parent 9fd1b6f3f8
commit 595738296f
8 changed files with 56 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
tests/i18n/patterns/locale/en/LC_MESSAGES/django.mo
View File

Binary file not shown.

20
tests/i18n/patterns/locale/en/LC_MESSAGES/django.po
View File

@ -7,7 +7,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: PACKAGE VERSION\n" "Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \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" "PO-Revision-Date: 2011-06-14 16:16+0100\n"
"Last-Translator: Jannis Leidel <jannis@leidel.info>\n" "Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
"Language-Team: LANGUAGE <LL@li.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n"
@ -17,22 +17,30 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"
#: urls/default.py:11 #: urls/default.py:11
msgid "^translated/$" #, fuzzy
#| msgid "^translated/$"
msgid "translated/"
msgstr "^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<slug>[\\w-]+)/$" msgid "^translated/(?P<slug>[\\w-]+)/$"
msgstr "^translated/(?P<slug>[\\w-]+)/$" msgstr "^translated/(?P<slug>[\\w-]+)/$"
#: urls/default.py:24 #: urls/default.py:25
msgid "^with-arguments/(?P<argument>[\\w-]+)/(?:(?P<optional>[\\w-]+).html)?$" msgid "^with-arguments/(?P<argument>[\\w-]+)/(?:(?P<optional>[\\w-]+).html)?$"
msgstr "" msgstr ""
#: urls/default.py:28 #: urls/default.py:29
msgid "^users/$" msgid "^users/$"
msgstr "^users/$" msgstr "^users/$"
#: urls/default.py:30 urls/wrong.py:7 #: urls/default.py:31 urls/wrong.py:7
msgid "^account/" msgid "^account/"
msgstr "^account/" msgstr "^account/"

BIN
tests/i18n/patterns/locale/nl/LC_MESSAGES/django.mo
View File

Binary file not shown.

18
tests/i18n/patterns/locale/nl/LC_MESSAGES/django.po
View File

@ -7,7 +7,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: PACKAGE VERSION\n" "Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \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" "PO-Revision-Date: 2011-06-14 16:16+0100\n"
"Last-Translator: Jannis Leidel <jannis@leidel.info>\n" "Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
"Language-Team: LANGUAGE <LL@li.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n"
@ -18,22 +18,26 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n != 1)\n" "Plural-Forms: nplurals=2; plural=(n != 1)\n"
#: urls/default.py:11 #: urls/default.py:11
msgid "^translated/$" msgid "translated/"
msgstr "^vertaald/$" msgstr "vertaald/"
#: urls/default.py:13 #: urls/default.py:12
msgid "^translated-regex/$"
msgstr "^vertaald-regex/$"
#: urls/default.py:14
msgid "^translated/(?P<slug>[\\w-]+)/$" msgid "^translated/(?P<slug>[\\w-]+)/$"
msgstr "^vertaald/(?P<slug>[\\w-]+)/$" msgstr "^vertaald/(?P<slug>[\\w-]+)/$"
#: urls/default.py:24 #: urls/default.py:25
msgid "^with-arguments/(?P<argument>[\\w-]+)/(?:(?P<optional>[\\w-]+).html)?$" msgid "^with-arguments/(?P<argument>[\\w-]+)/(?:(?P<optional>[\\w-]+).html)?$"
msgstr "" msgstr ""
#: urls/default.py:28 #: urls/default.py:29
msgid "^users/$" msgid "^users/$"
msgstr "^gebruikers/$" msgstr "^gebruikers/$"
#: urls/default.py:30 urls/wrong.py:7 #: urls/default.py:31 urls/wrong.py:7
msgid "^account/" msgid "^account/"
msgstr "^profiel/" msgstr "^profiel/"

BIN
tests/i18n/patterns/locale/pt_BR/LC_MESSAGES/django.mo
View File

Binary file not shown.

18
tests/i18n/patterns/locale/pt_BR/LC_MESSAGES/django.po
View File

@ -7,7 +7,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: PACKAGE VERSION\n" "Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \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" "PO-Revision-Date: 2011-06-14 16:17+0100\n"
"Last-Translator: Jannis Leidel <jannis@leidel.info>\n" "Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
"Language-Team: LANGUAGE <LL@li.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n"
@ -18,22 +18,26 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n > 1)\n" "Plural-Forms: nplurals=2; plural=(n > 1)\n"
#: urls/default.py:11 #: urls/default.py:11
msgid "^translated/$" msgid "translated/"
msgstr "^traduzidos/$" msgstr "traduzidos/"
#: urls/default.py:13 #: urls/default.py:12
msgid "^translated-regex/$"
msgstr "^traduzidos-regex/$"
#: urls/default.py:14
msgid "^translated/(?P<slug>[\\w-]+)/$" msgid "^translated/(?P<slug>[\\w-]+)/$"
msgstr "^traduzidos/(?P<slug>[\\w-]+)/$" msgstr "^traduzidos/(?P<slug>[\\w-]+)/$"
#: urls/default.py:24 #: urls/default.py:25
msgid "^with-arguments/(?P<argument>[\\w-]+)/(?:(?P<optional>[\\w-]+).html)?$" msgid "^with-arguments/(?P<argument>[\\w-]+)/(?:(?P<optional>[\\w-]+).html)?$"
msgstr "" msgstr ""
#: urls/default.py:28 #: urls/default.py:29
msgid "^users/$" msgid "^users/$"
msgstr "^usuarios/$" msgstr "^usuarios/$"
#: urls/default.py:30 urls/wrong.py:7 #: urls/default.py:31 urls/wrong.py:7
msgid "^account/" msgid "^account/"
msgstr "^conta/" msgstr "^conta/"

14
tests/i18n/patterns/tests.py
View File

@ -134,6 +134,9 @@ class URLTranslationTests(URLTestCaseBase):
def test_no_prefix_translated(self): def test_no_prefix_translated(self):
with translation.override("en"): with translation.override("en"):
self.assertEqual(reverse("no-prefix-translated"), "/translated/") self.assertEqual(reverse("no-prefix-translated"), "/translated/")
self.assertEqual(
reverse("no-prefix-translated-regex"), "/translated-regex/"
)
self.assertEqual( self.assertEqual(
reverse("no-prefix-translated-slug", kwargs={"slug": "yeah"}), reverse("no-prefix-translated-slug", kwargs={"slug": "yeah"}),
"/translated/yeah/", "/translated/yeah/",
@ -141,6 +144,7 @@ class URLTranslationTests(URLTestCaseBase):
with translation.override("nl"): with translation.override("nl"):
self.assertEqual(reverse("no-prefix-translated"), "/vertaald/") self.assertEqual(reverse("no-prefix-translated"), "/vertaald/")
self.assertEqual(reverse("no-prefix-translated-regex"), "/vertaald-regex/")
self.assertEqual( self.assertEqual(
reverse("no-prefix-translated-slug", kwargs={"slug": "yeah"}), reverse("no-prefix-translated-slug", kwargs={"slug": "yeah"}),
"/vertaald/yeah/", "/vertaald/yeah/",
@ -148,6 +152,9 @@ class URLTranslationTests(URLTestCaseBase):
with translation.override("pt-br"): with translation.override("pt-br"):
self.assertEqual(reverse("no-prefix-translated"), "/traduzidos/") self.assertEqual(reverse("no-prefix-translated"), "/traduzidos/")
self.assertEqual(
reverse("no-prefix-translated-regex"), "/traduzidos-regex/"
)
self.assertEqual( self.assertEqual(
reverse("no-prefix-translated-slug", kwargs={"slug": "yeah"}), reverse("no-prefix-translated-slug", kwargs={"slug": "yeah"}),
"/traduzidos/yeah/", "/traduzidos/yeah/",
@ -180,7 +187,7 @@ class URLTranslationTests(URLTestCaseBase):
"/nl/profiel/registreren-als-pad/", "/nl/profiel/registreren-als-pad/",
) )
self.assertEqual(translation.get_language(), "en") self.assertEqual(translation.get_language(), "en")
# URL with parameters. # re_path() URL with parameters.
self.assertEqual( self.assertEqual(
translate_url("/en/with-arguments/regular-argument/", "nl"), translate_url("/en/with-arguments/regular-argument/", "nl"),
"/nl/with-arguments/regular-argument/", "/nl/with-arguments/regular-argument/",
@ -191,6 +198,11 @@ class URLTranslationTests(URLTestCaseBase):
), ),
"/nl/with-arguments/regular-argument/optional.html", "/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"): with translation.override("nl"):
self.assertEqual(translate_url("/nl/gebruikers/", "en"), "/en/users/") self.assertEqual(translate_url("/nl/gebruikers/", "en"), "/en/users/")

8
tests/i18n/patterns/urls/default.py
View File

@ -8,7 +8,8 @@ view = TemplateView.as_view(template_name="dummy.html")
urlpatterns = [ urlpatterns = [
path("not-prefixed/", view, name="not-prefixed"), path("not-prefixed/", view, name="not-prefixed"),
path("not-prefixed-include/", include("i18n.patterns.urls.included")), 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( re_path(
_(r"^translated/(?P<slug>[\w-]+)/$"), _(r"^translated/(?P<slug>[\w-]+)/$"),
view, view,
@ -25,6 +26,11 @@ urlpatterns += i18n_patterns(
view, view,
name="with-arguments", name="with-arguments",
), ),
path(
_("path-with-arguments/<str:argument>/"),
view,
name="path-with-arguments",
),
re_path(_(r"^users/$"), view, name="users"), re_path(_(r"^users/$"), view, name="users"),
re_path( re_path(
_(r"^account/"), include("i18n.patterns.urls.namespace", namespace="account") _(r"^account/"), include("i18n.patterns.urls.namespace", namespace="account")