From 464e202ad165e867d8c1bc266405d4aff5464f7e Mon Sep 17 00:00:00 2001 From: Bruno Alla Date: Mon, 25 Aug 2025 12:08:54 +0200 Subject: [PATCH 1/4] Add pre-commit hook to run compilemessages --- .pre-commit-config.yaml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index a5ea46db1a..55a5cb5633 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -45,3 +45,8 @@ repos: rev: v2.6.0 hooks: - id: pyproject-fmt + +- repo: https://github.com/browniebroke/django-pre-commit-hooks + rev: v1.1.0 + hooks: + - id: compile-messages From 88d8f40b11e5f216ffc045241255f0fa94d94a71 Mon Sep 17 00:00:00 2001 From: Bruno Alla Date: Sat, 20 Sep 2025 20:52:50 +0100 Subject: [PATCH 2/4] Install gettext for pre-commit --- .github/workflows/pre-commit.yml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/.github/workflows/pre-commit.yml b/.github/workflows/pre-commit.yml index 8432fe48b3..86d1ef07cb 100644 --- a/.github/workflows/pre-commit.yml +++ b/.github/workflows/pre-commit.yml @@ -9,14 +9,12 @@ on: jobs: pre-commit: runs-on: ubuntu-latest - steps: - uses: actions/checkout@v5 with: fetch-depth: 0 - - uses: actions/setup-python@v6 with: - python-version: "3.10" - + python-version: "3.x" + - run: sudo apt install -y gettext - uses: pre-commit/action@v3.0.1 From c7625150c7f1f42ec2e5721f0953cca8b4df4611 Mon Sep 17 00:00:00 2001 From: Bruno Alla Date: Sat, 20 Sep 2025 20:59:25 +0100 Subject: [PATCH 3/4] Make a small change to French translations --- rest_framework/locale/fr/LC_MESSAGES/django.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rest_framework/locale/fr/LC_MESSAGES/django.po b/rest_framework/locale/fr/LC_MESSAGES/django.po index 9410b736f7..ee48f2c257 100644 --- a/rest_framework/locale/fr/LC_MESSAGES/django.po +++ b/rest_framework/locale/fr/LC_MESSAGES/django.po @@ -276,7 +276,7 @@ msgstr "La date n'a pas le bon format. Utilisez un des formats suivants : {form #: fields.py:1237 msgid "Expected a date but got a datetime." -msgstr "Attendait une date mais a reçu une date + heure." +msgstr "Attendait une date mais a reçu une date et heure." #: fields.py:1303 #, python-brace-format From 024aadfb9514763c8a66a7b42479a7c89d7f76ce Mon Sep 17 00:00:00 2001 From: Bruno Alla Date: Sat, 20 Sep 2025 21:01:33 +0100 Subject: [PATCH 4/4] Add missing compiled message file --- .../locale/fr/LC_MESSAGES/django.mo | Bin 13379 -> 13380 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/rest_framework/locale/fr/LC_MESSAGES/django.mo b/rest_framework/locale/fr/LC_MESSAGES/django.mo index e29c704f1382a9891d2fcfe43fcb63e47455eb40..b25dfd7534e8f567f18c6e13f918c1dca43d6154 100644 GIT binary patch delta 788 zcmXZZJ#39p7y#fG{n2Qf)?cVzt@PKe-&RN}2qIB!goLI`$4Xn1V3cc-P8P!@22FJB zAn9O1BASqPB4H2qkFd~L}A`bEjNBDrJ z`GrOH_C^fwBDe7t>sjU=KH?Fs@+8;wMNIMxr?|i|HuOhq&Y|(vgw2M1A&P%*GP%>GtQXTM% zHNJavv6)3$BTlfu8MbkbS?Do``H~&{LnWepZ^SO1WgTbP$!l!nJ?6Oil3<@;m9_j` z9gxZFyon9$WEYDZ<#`_EL*~(csQz!>U)k9pcgW8%=PhtMU$dQ`tN%-X1;-@X4pf|A zUP+l*;61azPj+*Qdom@4ImTIL<4>78ea_tBGPBXQ%%d-OUF8LC;4?a*QoIr5QGaJH z@Q>DtZWow4yUaX+yR7GZ<^uC<( delta 787 zcmXZZJ8X_o7y#h6=tZJ?v$PV?4*>e86n|``UcV{_4qw*kOEz`QJR-`HG$VRGTmU2u>JiKT!1& z^Gar!3EnXi{9qs3+>>A8D91U?Ec^-cq|cZqTw)gbhS~Z~uWLNdb$m)4D&n;uTm6l> z!C%@ddR<_iY=YT=J8a}V<_2?Yk@