Skip to content

Commit d2c894f

Browse files
committed
Merge branch 'develop'
2 parents 4dabcfa + 63efa44 commit d2c894f

161 files changed

Lines changed: 6086 additions & 597 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/workflows/pr.yaml

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -186,3 +186,37 @@ jobs:
186186
- name: Reverse patch
187187
run: |
188188
docker compose exec phpfpm patch --strip=1 --verbose --input=${{ matrix.patch }} --reverse
189+
190+
check-translations:
191+
name: Check translation are up to date
192+
runs-on: ubuntu-latest
193+
steps:
194+
- uses: actions/checkout@v4
195+
- uses: go-task/setup-task@v1
196+
197+
- name: Install site
198+
run: |
199+
docker network create frontend
200+
docker compose pull
201+
docker compose up --detach
202+
203+
# Important: Use --no-interaction to make https://getcomposer.org/doc/06-config.md#discard-changes have effect.
204+
docker compose exec phpfpm composer install --no-interaction
205+
206+
# Install the site
207+
docker compose exec phpfpm vendor/bin/drush site:install --existing-config --yes
208+
209+
- run: |
210+
task translations:extract
211+
212+
# https://github.com/mxschmitt/action-tmate?tab=readme-ov-file#manually-triggered-debug
213+
# Enable tmate debugging if debug logging is enabled (cf.
214+
# https://docs.github.com/en/actions/writing-workflows/choosing-what-your-workflow-does/accessing-contextual-information-about-workflow-runs#runner-context)
215+
- name: Setup tmate session
216+
uses: mxschmitt/action-tmate@v3
217+
with:
218+
limit-access-to-actor: false
219+
if: 1 == runner.debug
220+
221+
- run: |
222+
task translations:git:diff

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,3 +45,4 @@ private-files
4545
/playwright/.cache/
4646

4747
config/sync/**/webform.webform.*
48+
*.mo

.prettierignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
11
# Ignore all Drupal config
22
config/
3+
web/sites/default/default.services.yml

.woodpecker/prod.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,9 @@ steps:
2525
pre_up:
2626
- itkdev-docker-compose-server run --rm phpfpm vendor/bin/drush --yes cache:rebuild
2727
- itkdev-docker-compose-server run --rm phpfpm vendor/bin/drush --yes deploy
28+
- itkdev-docker-compose-server run --rm phpfpm vendor/bin/drush --yes locale:check
29+
- itkdev-docker-compose-server run --rm phpfpm vendor/bin/drush --yes locale:update
30+
- itkdev-docker-compose-server run --rm phpfpm vendor/bin/drush --yes cache:rebuild
2831
cron:
2932
cron:
3033
minute: "*/5"

.woodpecker/stg.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,4 +40,7 @@ steps:
4040
- docker compose run --rm node npm --prefix web/themes/custom/hoeringsportal install
4141
- docker compose run --rm node npm --prefix web/themes/custom/hoeringsportal run build
4242
- docker compose run --rm node rm -rf web/themes/custom/hoeringsportal/node_modules
43+
# Update translations
44+
- itkdev-docker-compose-server exec phpfpm vendor/bin/drush --yes locale:check
45+
- itkdev-docker-compose-server exec phpfpm vendor/bin/drush --yes locale:update
4346
- itkdev-docker-compose-server exec phpfpm vendor/bin/drush --yes cache:rebuild

CHANGELOG.md

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,25 @@ Versioning](https://semver.org/spec/v2.0.0.html).
66

77
## [Unreleased]
88

9+
## [4.14.4] - 2026-01-27
10+
11+
* [PR-588](https://github.com/itk-dev/deltag.aarhus.dk/pull/588)
12+
Added area and age span selection to dialogue proposal form
13+
* [PR-591](https://github.com/itk-dev/deltag.aarhus.dk/pull/591)
14+
* Cleaned up local OIDC setup
15+
* Added test server OIDC setup
16+
* [PR-587](https://github.com/itk-dev/deltag.aarhus.dk/pull/587)
17+
Cleaned up translations
18+
* [PR-586](https://github.com/itk-dev/hoeringsportal/pull/586)
19+
* Added course content type
20+
* Added activity wrapper for public_events and courses
21+
* [PR-576](https://github.com/itk-dev/deltag.aarhus.dk/pull/576)
22+
Updates translations and added translations handling to deployment
23+
* [PR-584](https://github.com/itk-dev/deltag.aarhus.dk/pull/584)
24+
Removed field_deskpro_department_id from public_meeting content type
25+
* [PR-585](https://github.com/itk-dev/deltag.aarhus.dk/pull/585)
26+
Added translations to multiple modules
27+
928
## [4.14.3] - 2026-01-16
1029

1130
* [589](https://github.com/itk-dev/deltag.aarhus.dk/pull/589)

README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
4. [Pretix setup](documentation/pretix.md)
1818
5. [Custom Høringsportalen theme](web/themes/custom/hoeringsportal/README.md)
1919
6. [Testing](documentation/Testing.md)
20+
7. [Server](documentation/Server.md)
2021

2122
## Database dumps
2223

Taskfile.yml

Lines changed: 44 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,46 @@ version: "3"
33
# https://taskfile.dev/usage/#env-files
44
dotenv: [".env.local", ".env"]
55

6+
includes:
7+
translations:
8+
taskfile: ./task/Taskfile.translations.yml
9+
vars:
10+
TRANSLATION_MODULES:
11+
# - aarhus_hero
12+
13+
- hoeringsportal_activity
14+
- hoeringsportal_anonymous_edit
15+
# - hoeringsportal_audit_log
16+
# - hoeringsportal_base_fixtures
17+
- hoeringsportal_citizen_proposal
18+
- hoeringsportal_citizen_proposal_archiving
19+
# - hoeringsportal_config_settings
20+
# - hoeringsportal_content_access
21+
# - hoeringsportal_content_blocks
22+
# - hoeringsportal_data
23+
# - hoeringsportal_deskpro
24+
- hoeringsportal_dialogue
25+
# - hoeringsportal_forms
26+
- hoeringsportal_hearing
27+
# - hoeringsportal_misc
28+
# - hoeringsportal_openid_connect
29+
# - hoeringsportal_project
30+
- hoeringsportal_project_timeline
31+
- hoeringsportal_public_meeting
32+
- hoeringsportal_quicklinks
33+
# - hoeringsportal_test_delta_sync_fixtures
34+
35+
- itk_admin
36+
- itk_admin_links
37+
# - itk_media_entity
38+
39+
TRANSLATION_THEMES:
40+
- hoeringsportal
41+
# - hoeringsportal_admin
42+
43+
TRANSLATION_LANGUAGES:
44+
- da
45+
646
vars:
747
# https://taskfile.dev/reference/templating/
848
BASE_URL: '{{.TASK_BASE_URL | default .COMPOSE_SERVER_DOMAIN | default .COMPOSE_DOMAIN | default "https://deltag.local.itkdev.dk"}}'
@@ -312,20 +352,12 @@ tasks:
312352
silent: true
313353

314354
translations:import:
355+
desc: Import and update translations
315356
cmds:
316357
- task compose -- exec phpfpm bash -c '(cd web && ../vendor/bin/drush locale:import --type=customized --override=all da ../translations/custom-translations.da.po)'
317-
- task drush -- php:eval "var_export(\Drupal::state()->get('locale.translation.formulae', []))"
318-
- 'task drush -- php:eval "var_export(array_map(static fn (\$count) => (new \Drupal\Core\StringTranslation\PluralTranslatableMarkup(\$count, ''1 item'', ''@count items'', options: [''langcode'' => ''da'']))->render(), range(0, 5)));"'
319-
- 'task drush -- php:eval "var_export(array_map(static fn (\$count) => (new \Drupal\Core\StringTranslation\PluralTranslatableMarkup(\$count, ''1 item'', ''@count items'', options: [''langcode'' => ''en'']))->render(), range(0, 5)));"'
320-
silent: true
321-
322-
translations:export:
323-
cmds:
324-
- task compose -- exec phpfpm bash -c '(cd web && ../vendor/bin/drush locale:export da --types=customized > ../translations/custom-translations.da.po)'
325-
# Fix plurals spec in PO file
326-
# https://drupalsun.com/eelke/2020/08/17/tale-mistranslated-plurals
327-
# https://www.drupal.org/project/drupal/issues/3496223
328-
- 'task compose -- exec phpfpm sed -i "s/Plural-Forms: nplurals=2; plural=(n > 1);/Plural-Forms: nplurals=2; plural=(n != 1);/" translations/custom-translations.da.po'
358+
- task drush -- locale:check
359+
- task drush -- locale:update
360+
- task drush -- cache:rebuild
329361
silent: true
330362

331363
# Development settings tasks (`/admin/config/development/settings`) (cf. https://www.drupal.org/docs/develop/development-tools/disabling-and-debugging-caching).

composer.json

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -96,6 +96,7 @@
9696
"drupal/masquerade": "^2.0",
9797
"drupal/webprofiler": "^10.3",
9898
"ergebnis/composer-normalize": "^2.44",
99+
"itk-dev/drupal_translation_extractor": "^1.0",
99100
"mglaman/phpstan-drupal": "^1.1",
100101
"phpstan/extension-installer": "^1.2",
101102
"phpstan/phpstan-deprecation-rules": "^1.1",
@@ -317,6 +318,9 @@
317318
},
318319
"drupal/site_status_message": {
319320
"Add cache support (https://www.drupal.org/project/site_status_message/issues/3497218)": "https://git.drupalcode.org/project/site_status_message/-/merge_requests/8.diff"
321+
},
322+
"vincentlanglet/twig-cs-fixer": {
323+
"Drupal's trans tag has an optional plural tag which conflicts with the trans tag from Symfony's Twig bridge (cf. https://github.com/VincentLanglet/Twig-CS-Fixer/pull/134#issuecomment-1756924889)": "patches/vincentlanglet/twig-cs-fixer/token-parser.patch"
320324
}
321325
},
322326
"scripts": {

0 commit comments

Comments
 (0)