Skip to content

Commit cc8b10a

Browse files
committed
chore: remove S3 cache-control work from iframe-detection branch
1 parent bf0d12e commit cc8b10a

6 files changed

Lines changed: 83 additions & 311 deletions

File tree

.github/workflows/ci-check-i18n.yml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,5 @@ jobs:
5151
run: |
5252
just makemessages
5353
just compilemessages
54-
# Only check .po files — .mo binaries differ between gettext versions
55-
git diff --exit-code sites_conformes/locale/fr/LC_MESSAGES/*.po
56-
git diff --exit-code sites_conformes/*/locale/fr/LC_MESSAGES/*.po
54+
git diff --exit-code sites_conformes/locale/
55+
git diff --exit-code sites_conformes/*/locale/

.github/workflows/ci-main.yml

Lines changed: 0 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -53,44 +53,3 @@ jobs:
5353
run: |
5454
just init
5555
uv run python manage.py create_demo_pages
56-
57-
integration-s3:
58-
runs-on: ubuntu-latest
59-
env:
60-
DJANGO_SETTINGS_MODULE: config.settings_s3_test
61-
steps:
62-
- uses: actions/checkout@v4
63-
- name: 📔 Install just
64-
uses: extractions/setup-just@v2
65-
- name: 🐍 Set up Python 3.13
66-
uses: actions/setup-python@v4
67-
with:
68-
python-version: "3.13"
69-
- name: 🐍 Set up uv
70-
uses: astral-sh/setup-uv@v5
71-
- name: 🌍 Install dependencies
72-
run: |
73-
uv sync --no-group dev
74-
- name: 📄 Copy empty .env.test to .env
75-
run: |
76-
cp .env.test .env
77-
- name: 🐳 Start Garage cluster
78-
run: |
79-
docker compose up -d garage
80-
echo "Waiting for Garage to be ready..."
81-
sleep 5
82-
docker compose logs garage
83-
- name: 🤹‍ Run S3 integration tests
84-
env:
85-
GARAGE_INTEGRATION_TESTS: "1"
86-
S3_HOST: garage:3900
87-
S3_KEY_ID: GKarageKEY00000000000000000
88-
# Set S3_KEY_SECRET from the Garage credentials in docker-compose.yml
89-
# (GARAGE_DEFAULT_SECRET_KEY). Not a real secret — it's a dev key.
90-
S3_KEY_SECRET: GKarag...
91-
S3_BUCKET_NAME: sites-conformes-media
92-
S3_BUCKET_REGION: fr
93-
S3_PROTOCOL: http
94-
run: |
95-
uv run python manage.py test \
96-
sites_conformes.core.tests.test_s3_integration

pyproject.toml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,6 @@ dependencies = [
4040
"wand>=0.6.13",
4141
"wagtail-honeypot>=1.2.1",
4242
"sentry-sdk[django]>=2.61.0",
43-
"minio>=7.2.20",
4443
]
4544

4645
[dependency-groups]

sites_conformes/core/management/commands/set_s3_cache_control.py

Lines changed: 0 additions & 165 deletions
This file was deleted.

sites_conformes/locale/fr/LC_MESSAGES/django.po

Lines changed: 81 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ msgid ""
88
msgstr ""
99
"Project-Id-Version: \n"
1010
"Report-Msgid-Bugs-To: \n"
11-
"POT-Creation-Date: 2026-07-01 11:54+0200\n"
11+
"POT-Creation-Date: 2026-07-16 16:39+0200\n"
1212
"PO-Revision-Date: 2026-04-09 13:09+0200\n"
1313
"Last-Translator: Sylvain Boissel <sylvain@boissel.dev>\n"
1414
"Language-Team: \n"
@@ -19,6 +19,86 @@ msgstr ""
1919
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
2020
"X-Generator: Poedit 3.9\n"
2121

22+
msgid ""
23+
"Tout ce qui se trouve après ce bloc est masqué lorsque la page est affichée "
24+
"dans une iframe (par ex. intégration sur un site partenaire). Utilisez-le "
25+
"sur les fiches qui n'ont pas de « Carte sur mesure »."
26+
msgstr ""
27+
28+
msgid "Vertical card"
29+
msgstr ""
30+
31+
msgid "DSFR components"
32+
msgstr ""
33+
34+
msgid "Contact card"
35+
msgstr ""
36+
37+
msgid "Extra components"
38+
msgstr ""
39+
40+
msgid "Content"
41+
msgstr ""
42+
43+
msgid "Tab"
44+
msgstr ""
45+
46+
msgid "Tabs"
47+
msgstr ""
48+
49+
msgid "Close"
50+
msgstr "Fermer"
51+
52+
#, python-format
53+
msgid " By %(filter_title)s "
54+
msgstr ""
55+
56+
msgid "Remove"
57+
msgstr ""
58+
59+
msgid "Toggle navigation"
60+
msgstr ""
61+
62+
msgid "Sidebar"
63+
msgstr ""
64+
65+
msgid "Start typing to filter…"
66+
msgstr ""
67+
68+
msgid "Filter navigation items"
69+
msgstr ""
70+
71+
msgid "Pagination"
72+
msgstr ""
73+
74+
msgid "First page"
75+
msgstr ""
76+
77+
#, fuzzy
78+
#| msgid "Share this page"
79+
msgid "Previous page"
80+
msgstr "Partager cette page"
81+
82+
msgid "Page"
83+
msgstr ""
84+
85+
#, fuzzy
86+
#| msgid "Home page"
87+
msgid "Next page"
88+
msgstr "Accueil"
89+
90+
msgid "Last page"
91+
msgstr ""
92+
93+
msgid "Tabs group"
94+
msgstr ""
95+
96+
msgid "Search"
97+
msgstr "Rechercher"
98+
99+
msgid "Main menu"
100+
msgstr "Menu principal"
101+
22102
msgid "Error 404 — Page not found"
23103
msgstr "Erreur 404 — Page non trouvée"
24104

@@ -101,18 +181,9 @@ msgstr "Ce site est fait avec"
101181
msgid "Home page"
102182
msgstr "Accueil"
103183

104-
msgid "Search"
105-
msgstr "Rechercher"
106-
107-
msgid "Close"
108-
msgstr "Fermer"
109-
110184
msgid "Menu"
111185
msgstr "Menu"
112186

113-
msgid "Main menu"
114-
msgstr "Menu principal"
115-
116187
msgid "Hide message"
117188
msgstr "Masquer le message"
118189

0 commit comments

Comments
 (0)