Skip to content

Commit

Permalink
Merge branch 'numerique-gouv:main' into main_tchap
Browse files Browse the repository at this point in the history
  • Loading branch information
MarcWadai authored Jan 7, 2025
2 parents b387fff + d0bab59 commit 8971df8
Show file tree
Hide file tree
Showing 29 changed files with 21,884 additions and 376 deletions.
File renamed without changes.
47 changes: 47 additions & 0 deletions .github/workflows/ci-check-migrations.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
name: 🔮 CI - Migrations Check

on:
pull_request:
types:
- opened
- synchronize
- reopened
- ready_for_review

jobs:
build:
if: github.event.pull_request.draft == false
runs-on: ubuntu-latest
env:
DJANGO_SETTINGS_MODULE: config.settings_test
PYTHONPATH: .
strategy:
matrix:
python-version: ["3.12"]
services:
postgres:
image: postgres:14-alpine
env:
POSTGRES_USER: dju
POSTGRES_PASSWORD: djpwd
POSTGRES_DB: djdb
ports:
- 5432:5432
steps:
- uses: actions/checkout@v3
- name: 🐍 Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v4
with:
python-version: ${{ matrix.python-version }}
- name: 🌍 Install dependencies
run: |
python -m pip install --upgrade pip
pip install poetry
pip install ruff
poetry install --no-root
- name: 📄 Copy empty .env.test to .env
run: |
cp .env.test .env
- name: 🚧 Check pending migrations
run: |
poetry run django-admin makemigrations --check --dry-run --noinput
7 changes: 2 additions & 5 deletions .github/workflows/ci.yml → .github/workflows/ci-main.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: 🔮 CI
name: 🔮 CI - Main checks

on: [push]

Expand All @@ -10,7 +10,7 @@ jobs:
PYTHONPATH: .
strategy:
matrix:
python-version: ["3.10", "3.11", "3.12"]
python-version: ["3.10", "3.11", "3.12", "3.13"]
services:
postgres:
image: postgres:14-alpine
Expand Down Expand Up @@ -38,9 +38,6 @@ jobs:
- name: ✨ Black & ruff
run: |
make quality
- name: 🚧 Check pending migrations # continue-on-error: true
run: |
poetry run django-admin makemigrations --check --dry-run --noinput
- name: 🤹‍ Run the unit tests
run: |
make test-unit
Expand Down
Binary file modified blog/locale/fr/LC_MESSAGES/django.mo
Binary file not shown.
20 changes: 10 additions & 10 deletions blog/locale/fr/LC_MESSAGES/django.po
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2024-11-27 14:45+0100\n"
"PO-Revision-Date: 2024-11-27 14:47+0100\n"
"POT-Creation-Date: 2024-12-10 14:32+0100\n"
"PO-Revision-Date: 2024-12-10 14:33+0100\n"
"Last-Translator: \n"
"Language-Team: \n"
"Language: fr\n"
Expand Down Expand Up @@ -78,8 +78,8 @@ msgstr "Il est impossible d’avoir des parents circulaires."
msgid "Category"
msgstr "Catégorie"

#: blog/models.py:167 blog/models.py:279 blog/models.py:460 blog/models.py:467
#: blog/models.py:518
#: blog/models.py:167 blog/models.py:279 blog/models.py:461 blog/models.py:468
#: blog/models.py:519
msgid "Categories"
msgstr "Catégories"

Expand Down Expand Up @@ -119,7 +119,7 @@ msgstr "Afficher les filtres"
msgid "Blog index"
msgstr "Index de blog"

#: blog/models.py:262 blog/models.py:483 blog/models.py:497
#: blog/models.py:262 blog/models.py:484 blog/models.py:498
#: blog/templates/blog/tags_list_page.html:20
msgid "Tags"
msgstr "Étiquettes"
Expand All @@ -143,23 +143,23 @@ msgstr "Articles écrits par"
msgid "Posts published in %(year)s"
msgstr "Articles publiés en %(year)s"

#: blog/models.py:520
#: blog/models.py:521
msgid "Post date"
msgstr "Date de publication"

#: blog/models.py:522
#: blog/models.py:523
msgid "Author entries can be created in Snippets > Persons"
msgstr "Les auteurs peuvent être créés via Fragments > Personnes"

#: blog/models.py:541
#: blog/models.py:542
msgid "Scheduled publishing"
msgstr "Publication planifiée"

#: blog/models.py:549
#: blog/models.py:550
msgid "Tags and Categories"
msgstr "Étiquettes et Catégories"

#: blog/models.py:565
#: blog/models.py:566
msgid "Blog page"
msgstr "Page de blog"

Expand Down
Loading

0 comments on commit 8971df8

Please sign in to comment.