diff --git a/froide/account/forms.py b/froide/account/forms.py index fa9f28382..812cba72c 100644 --- a/froide/account/forms.py +++ b/froide/account/forms.py @@ -17,6 +17,7 @@ from froide.helper.content_urls import get_content_url from froide.helper.form_utils import JSONMixin +from froide.helper.language import get_user_language_choices from froide.helper.spam import SpamProtectionMixin from froide.helper.widgets import ( BootstrapCheckboxInput, @@ -625,7 +626,11 @@ def save(self, commit=True): class AccountSettingsForm(forms.ModelForm): + language = forms.ChoiceField( + choices=get_user_language_choices, + widget=BootstrapSelect, + ) + class Meta: model = User fields = ["language"] - widgets = {"language": BootstrapSelect} diff --git a/froide/account/migrations/0042_alter_user_language.py b/froide/account/migrations/0042_alter_user_language.py new file mode 100644 index 000000000..6a041792d --- /dev/null +++ b/froide/account/migrations/0042_alter_user_language.py @@ -0,0 +1,19 @@ +# Generated by Django 5.2.12 on 2026-04-15 10:47 + +import froide.helper.language +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('account', '0041_alter_application_authorization_grant_type'), + ] + + operations = [ + migrations.AlterField( + model_name='user', + name='language', + field=models.CharField(choices=froide.helper.language.get_language_choices, default=froide.helper.language.get_default_language, help_text='Determines the default language of communication with you.', max_length=10, verbose_name='Language'), + ), + ] diff --git a/froide/account/models.py b/froide/account/models.py index 805b88840..7361fab99 100644 --- a/froide/account/models.py +++ b/froide/account/models.py @@ -25,6 +25,7 @@ from taggit.models import TagBase, TaggedItemBase from froide.helper.csv_utils import export_csv, get_dict +from froide.helper.language import get_default_language, get_language_choices from froide.helper.storage import HashedFilenameStorage, delete_file_if_last_reference @@ -180,8 +181,8 @@ class User(AbstractBaseUser, PermissionsMixin): language = models.CharField( verbose_name=_("Language"), max_length=10, - default=settings.LANGUAGE_CODE, - choices=settings.LANGUAGES, + default=get_default_language, + choices=get_language_choices, help_text=_("Determines the default language of communication with you."), ) diff --git a/froide/document/migrations/0032_alter_document_language.py b/froide/document/migrations/0032_alter_document_language.py new file mode 100644 index 000000000..88da20219 --- /dev/null +++ b/froide/document/migrations/0032_alter_document_language.py @@ -0,0 +1,19 @@ +# Generated by Django 5.2.12 on 2026-04-20 10:05 + +import filingcabinet.language +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('document', '0031_alter_document_updated_at_alter_document_user_and_more'), + ] + + operations = [ + migrations.AlterField( + model_name='document', + name='language', + field=models.CharField(blank=True, choices=filingcabinet.language.get_language_choices, default=filingcabinet.language.get_default_language, max_length=10), + ), + ] diff --git a/froide/foirequest/forms/request.py b/froide/foirequest/forms/request.py index 5681f6a53..169c89405 100644 --- a/froide/foirequest/forms/request.py +++ b/froide/foirequest/forms/request.py @@ -18,6 +18,7 @@ from froide.helper.auth import get_read_queryset from froide.helper.form_utils import JSONMixin from froide.helper.forms import TagObjectForm +from froide.helper.language import get_user_language_choices from froide.helper.text_utils import apply_user_redaction, redact_plaintext, slugify from froide.helper.widgets import BootstrapRadioSelect, BootstrapSelect, PriceInput from froide.publicbody.models import Category, PublicBody @@ -114,7 +115,7 @@ class RequestForm(JSONMixin, forms.Form): ) tags = TagField(required=False, widget=forms.HiddenInput) language = forms.ChoiceField( - choices=settings.LANGUAGES, + choices=get_user_language_choices, initial=settings.LANGUAGE_CODE, label=_("Language"), widget=forms.HiddenInput, diff --git a/froide/foirequest/migrations/0075_alter_foiproject_language_alter_foirequest_language.py b/froide/foirequest/migrations/0075_alter_foiproject_language_alter_foirequest_language.py new file mode 100644 index 000000000..5e4a7de28 --- /dev/null +++ b/froide/foirequest/migrations/0075_alter_foiproject_language_alter_foirequest_language.py @@ -0,0 +1,24 @@ +# Generated by Django 5.2.12 on 2026-04-15 10:47 + +import froide.helper.language +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('foirequest', '0074_requestdraft_proof'), + ] + + operations = [ + migrations.AlterField( + model_name='foiproject', + name='language', + field=models.CharField(blank=True, choices=froide.helper.language.get_language_choices, default=froide.helper.language.get_default_language, max_length=10), + ), + migrations.AlterField( + model_name='foirequest', + name='language', + field=models.CharField(blank=True, choices=froide.helper.language.get_language_choices, default=froide.helper.language.get_default_language, max_length=10), + ), + ] diff --git a/froide/foirequest/models/project.py b/froide/foirequest/models/project.py index 77fecaf9f..71b975d08 100644 --- a/froide/foirequest/models/project.py +++ b/froide/foirequest/models/project.py @@ -9,6 +9,7 @@ from taggit.managers import TaggableManager from taggit.models import TaggedItemBase +from froide.helper.language import get_default_language, get_language_choices from froide.helper.text_utils import redact_plaintext from froide.publicbody.models import PublicBody from froide.team.models import Team @@ -77,8 +78,8 @@ class FoiProject(models.Model): language = models.CharField( max_length=10, blank=True, - default=settings.LANGUAGE_CODE, - choices=settings.LANGUAGES, + default=get_default_language, + choices=get_language_choices, ) site = models.ForeignKey( diff --git a/froide/foirequest/models/request.py b/froide/foirequest/models/request.py index d9f0fff6b..63cdfccc5 100644 --- a/froide/foirequest/models/request.py +++ b/froide/foirequest/models/request.py @@ -22,6 +22,7 @@ from froide.campaign.models import Campaign from froide.helper.email_utils import make_address +from froide.helper.language import get_default_language, get_language_choices from froide.helper.text_diff import CONTENT_CACHE_THRESHOLD, get_differences from froide.helper.text_utils import redact_plaintext from froide.publicbody.models import FoiLaw, Jurisdiction, PublicBody @@ -413,8 +414,8 @@ class FoiRequest(models.Model): language = models.CharField( max_length=10, blank=True, - default=settings.LANGUAGE_CODE, - choices=settings.LANGUAGES, + default=get_default_language, + choices=get_language_choices, ) site = models.ForeignKey( diff --git a/froide/helper/context_processors.py b/froide/helper/context_processors.py index 491ea4145..281b050d8 100644 --- a/froide/helper/context_processors.py +++ b/froide/helper/context_processors.py @@ -17,6 +17,7 @@ def site_settings(request): request, "LANGUAGE_CODE", settings.LANGUAGE_CODE ), "DEFAULT_LANGUAGE_CODE": settings.LANGUAGE_CODE, + "USER_LANGUAGES": settings.USER_LANGUAGES, } diff --git a/froide/helper/language.py b/froide/helper/language.py new file mode 100644 index 000000000..072a84570 --- /dev/null +++ b/froide/helper/language.py @@ -0,0 +1,13 @@ +from django.conf import settings + + +def get_default_language(): + return settings.LANGUAGE_CODE + + +def get_language_choices(): + return settings.LANGUAGES + + +def get_user_language_choices(): + return settings.USER_LANGUAGES diff --git a/froide/settings.py b/froide/settings.py index 3d27f34dd..3b367ed77 100644 --- a/froide/settings.py +++ b/froide/settings.py @@ -299,6 +299,10 @@ def STATICFILES_DIRS(self): ("zh-hk", _("Chinese (Traditional, Hong Kong)")), ) + # Languages available for user-facing selection (e.g. account settings, language picker). + # Override in downstream projects to exclude content-only languages like de-ls. + USER_LANGUAGES = LANGUAGES + # If you set this to False, Django will make some optimizations so as not # to load the internationalization machinery. USE_I18N = values.BooleanValue(True) diff --git a/froide/templates/header.html b/froide/templates/header.html index 445aca06e..99b31109d 100644 --- a/froide/templates/header.html +++ b/froide/templates/header.html @@ -112,9 +112,9 @@ {% endif %} {% endblock nav_account_login %} {% block language_select %} - {% if LANGUAGES|length > 1 %} + {% if USER_LANGUAGES|length > 1 %}
  • - {% for lang_code, language in LANGUAGES %} + {% for lang_code, language in USER_LANGUAGES %} {% if lang_code == CURRENT_LANGUAGE_CODE %} - {% for lang_code, language in LANGUAGES %} + {% for lang_code, language in USER_LANGUAGES %}
    diff --git a/froide/tests/test_migration_stability.py b/froide/tests/test_migration_stability.py new file mode 100644 index 000000000..7096221ff --- /dev/null +++ b/froide/tests/test_migration_stability.py @@ -0,0 +1,38 @@ +from io import StringIO + +from django.core.management import call_command +from django.test import override_settings + +import pytest + +# LANGUAGES / LANGUAGE_CODE values that differ from the test settings to +# provoke a diff if any model field bakes the resolved settings value into +# its state (via choices=settings.LANGUAGES or default=settings.LANGUAGE_CODE). +DIFFERENT_LANGUAGES = ( + ("fr", "French"), + ("ja", "Japanese"), + ("pt-br", "Portuguese (Brazil)"), +) + + +@pytest.mark.django_db +@override_settings(LANGUAGES=DIFFERENT_LANGUAGES, LANGUAGE_CODE="ja") +def test_no_migration_needed_when_languages_change(): + """Changing LANGUAGES or LANGUAGE_CODE must not produce new migrations in froide apps.""" + out = StringIO() + try: + call_command( + "makemigrations", + "--check", + "--dry-run", + stdout=out, + ) + except SystemExit as e: + # Exit code 1 means migrations would be created + if e.code == 1: + pytest.fail( + "Changing settings.LANGUAGES or settings.LANGUAGE_CODE triggered " + "migration changes.\n" + f"Output: {out.getvalue()}" + ) + raise diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 03f41fa1e..a1ead25eb 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -13,7 +13,7 @@ importers: version: 0.94.5(typescript@5.9.3) '@okfde/filingcabinet': specifier: github:okfde/django-filingcabinet - version: https://codeload.github.com/okfde/django-filingcabinet/tar.gz/e15f2199b19178ae9b0dd42a994829bc04634bac(typescript@5.9.3)(worker-loader@3.0.8(webpack@5.94.0)) + version: https://codeload.github.com/okfde/django-filingcabinet/tar.gz/8ffb53086b0150a96778eb11adea95428184d8c8(typescript@5.9.3)(worker-loader@3.0.8(webpack@5.94.0)) '@panzoom/panzoom': specifier: ^4.6.1 version: 4.6.1 @@ -431,8 +431,8 @@ packages: prettier: ^3.5.3 prettier-config-standard: ^7.0.0 - '@okfde/filingcabinet@https://codeload.github.com/okfde/django-filingcabinet/tar.gz/e15f2199b19178ae9b0dd42a994829bc04634bac': - resolution: {tarball: https://codeload.github.com/okfde/django-filingcabinet/tar.gz/e15f2199b19178ae9b0dd42a994829bc04634bac} + '@okfde/filingcabinet@https://codeload.github.com/okfde/django-filingcabinet/tar.gz/8ffb53086b0150a96778eb11adea95428184d8c8': + resolution: {tarball: https://codeload.github.com/okfde/django-filingcabinet/tar.gz/8ffb53086b0150a96778eb11adea95428184d8c8} version: 0.0.4 '@panzoom/panzoom@4.6.1': @@ -679,6 +679,9 @@ packages: '@types/node@25.5.0': resolution: {integrity: sha512-jp2P3tQMSxWugkCUKLRPVUpGaL5MVFwF8RDuSRztfwgN1wmqJeMSbKlnEtQqU8UrhTmzEmZdu2I6v2dpp7XIxw==} + '@types/node@25.6.0': + resolution: {integrity: sha512-+qIYRKdNYJwY3vRCZMdJbPLJAtGjQBudzZzdzwQYkEPQd+PJGixUL5QfvCLDaULoLv+RhT3LDkwEfKaAkgSmNQ==} + '@types/retry@0.12.2': resolution: {integrity: sha512-XISRgDJ2Tc5q4TRqvgJtzsRkFYNJzZrhTdtMoGVBttwzzQJkPnS3WWTFc7kuDRoPtPakl+T+OfdEUjYJj7Jbow==} @@ -977,6 +980,7 @@ packages: '@xmldom/xmldom@0.9.9': resolution: {integrity: sha512-qycIHAucxy/LXAYIjmLmtQ8q9GPnMbnjG1KXhWm9o5sCr6pOYDATkMPiTNa6/v8eELyqOQ2FsEqeoFYmgv/gJg==} engines: {node: '>=14.6'} + deprecated: this version has critical issues, please update to the latest version '@xtuc/ieee754@1.2.0': resolution: {integrity: sha512-DX8nKgqcGwsc0eJSqYt5lwP4DH5FlHnmuWWBRy7X0NcaGR0ZtuyeESgMwTYVEtxmsNGY+qit4QYT/MIYTOTPeA==} @@ -1063,6 +1067,11 @@ packages: engines: {node: '>=6.0.0'} hasBin: true + baseline-browser-mapping@2.10.20: + resolution: {integrity: sha512-1AaXxEPfXT+GvTBJFuy4yXVHWJBXa4OdbIebGN/wX5DlsIkU0+wzGnd2lOzokSk51d5LUmqjgBLRLlypLUqInQ==} + engines: {node: '>=6.0.0'} + hasBin: true + big.js@5.2.2: resolution: {integrity: sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ==} @@ -1098,6 +1107,11 @@ packages: engines: {node: ^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7} hasBin: true + browserslist@4.28.2: + resolution: {integrity: sha512-48xSriZYYg+8qXna9kwqjIVzuQxi+KYWp2+5nCYnYKPTr0LvD89Jqk2Or5ogxz0NUMfIjhh2lIUX/LyX9B4oIg==} + engines: {node: ^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7} + hasBin: true + buffer-from@1.1.2: resolution: {integrity: sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==} @@ -1124,6 +1138,9 @@ packages: caniuse-lite@1.0.30001782: resolution: {integrity: sha512-dZcaJLJeDMh4rELYFw1tvSn1bhZWYFOt468FcbHHxx/Z/dFidd1I6ciyFdi3iwfQCyOjqo9upF6lGQYtMiJWxw==} + caniuse-lite@1.0.30001788: + resolution: {integrity: sha512-6q8HFp+lOQtcf7wBK+uEenxymVWkGKkjFpCvw5W25cmMwEDU45p1xQFBQv8JDlMMry7eNxyBaR+qxgmTUZkIRQ==} + chainsaw@0.1.0: resolution: {integrity: sha512-75kWfWt6MEKNC8xYXIdRpDehRYY/tNSgwKaJq+dbbDcxORuVrrQ+SEHoWsniVn9XPYfP4gmdWIeDk/4YNp1rNQ==} @@ -1296,6 +1313,9 @@ packages: electron-to-chromium@1.5.328: resolution: {integrity: sha512-QNQ5l45DzYytThO21403XN3FvK0hOkWDG8viNf6jqS42msJ8I4tGDSpBCgvDRRPnkffafiwAym2X2eHeGD2V0w==} + electron-to-chromium@1.5.340: + resolution: {integrity: sha512-908qahOGocRMinT2nM3ajCEM99H4iPdv84eagPP3FfZy/1ZGeOy2CZYzjhms81ckOPCXPlW7LkY4XpxD8r1DrA==} + emojis-list@3.0.0: resolution: {integrity: sha512-/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q==} engines: {node: '>= 4'} @@ -1835,6 +1855,9 @@ packages: node-releases@2.0.36: resolution: {integrity: sha512-TdC8FSgHz8Mwtw9g5L4gR/Sh9XhSP/0DEkQxfEFXOpiul5IiHgHan2VhYYb6agDSfp4KuvltmGApc8HMgUrIkA==} + node-releases@2.0.37: + resolution: {integrity: sha512-1h5gKZCF+pO/o3Iqt5Jp7wc9rH3eJJ0+nh/CIoiRwjRxde/hAHyLPXYN4V3CqKAbiZPSeJFSWHmJsbkicta0Eg==} + node-unzip-2@0.2.8: resolution: {integrity: sha512-fmJi73zTRW7RSo/1wyrKc2srKMwb3L6Ppke/7elzQ0QRt6sUjfiIcVsWdrqO5uEHAdvRKXjoySuo4HYe5BB0rw==} @@ -2241,6 +2264,9 @@ packages: undici-types@7.18.2: resolution: {integrity: sha512-AsuCzffGHJybSaRrmr5eHr81mwJU3kjw6M+uprWvCXiNeN9SOGwQ3Jn8jb8m3Z6izVgknn1R0FTCEAP2QrLY/w==} + undici-types@7.19.2: + resolution: {integrity: sha512-qYVnV5OEm2AW8cJMCpdV20CDyaN3g0AjDlOGf1OW4iaDEx8MwdtChUp4zu4H0VP3nDRF/8RKWH+IPp9uW0YGZg==} + undici@6.21.2: resolution: {integrity: sha512-uROZWze0R0itiAKVPsYhFov9LxrPMHLMEQFszeI2gCN6bnIIZ8twzBCJcN2LJrBBLfrP0t1FW0g+JmKVl8Vk1g==} engines: {node: '>=18.17'} @@ -2666,7 +2692,7 @@ snapshots: - typescript - vue-eslint-parser - '@okfde/filingcabinet@https://codeload.github.com/okfde/django-filingcabinet/tar.gz/e15f2199b19178ae9b0dd42a994829bc04634bac(typescript@5.9.3)(worker-loader@3.0.8(webpack@5.94.0))': + '@okfde/filingcabinet@https://codeload.github.com/okfde/django-filingcabinet/tar.gz/8ffb53086b0150a96778eb11adea95428184d8c8(typescript@5.9.3)(worker-loader@3.0.8(webpack@5.94.0))': dependencies: '@popperjs/core': 2.11.8 bootstrap: 5.3.8(@popperjs/core@2.11.8) @@ -2846,6 +2872,11 @@ snapshots: undici-types: 7.18.2 optional: true + '@types/node@25.6.0': + dependencies: + undici-types: 7.19.2 + optional: true + '@types/retry@0.12.2': {} '@types/web-bluetooth@0.0.21': {} @@ -3351,6 +3382,9 @@ snapshots: baseline-browser-mapping@2.10.12: {} + baseline-browser-mapping@2.10.20: + optional: true + big.js@5.2.2: optional: true @@ -3390,6 +3424,15 @@ snapshots: node-releases: 2.0.36 update-browserslist-db: 1.2.3(browserslist@4.28.1) + browserslist@4.28.2: + dependencies: + baseline-browser-mapping: 2.10.20 + caniuse-lite: 1.0.30001788 + electron-to-chromium: 1.5.340 + node-releases: 2.0.37 + update-browserslist-db: 1.2.3(browserslist@4.28.2) + optional: true + buffer-from@1.1.2: {} buffers@0.1.1: {} @@ -3417,6 +3460,9 @@ snapshots: caniuse-lite@1.0.30001782: {} + caniuse-lite@1.0.30001788: + optional: true + chainsaw@0.1.0: dependencies: traverse: 0.3.9 @@ -3584,6 +3630,9 @@ snapshots: electron-to-chromium@1.5.328: {} + electron-to-chromium@1.5.340: + optional: true + emojis-list@3.0.0: optional: true @@ -3945,7 +3994,7 @@ snapshots: jest-worker@27.5.1: dependencies: - '@types/node': 25.5.0 + '@types/node': 25.6.0 merge-stream: 2.0.0 supports-color: 8.1.1 optional: true @@ -4112,6 +4161,9 @@ snapshots: node-releases@2.0.36: {} + node-releases@2.0.37: + optional: true + node-unzip-2@0.2.8: dependencies: binary: 0.3.0 @@ -4526,6 +4578,9 @@ snapshots: undici-types@7.18.2: optional: true + undici-types@7.19.2: + optional: true + undici@6.21.2: {} update-browserslist-db@1.2.3(browserslist@4.28.1): @@ -4534,6 +4589,13 @@ snapshots: escalade: 3.2.0 picocolors: 1.1.1 + update-browserslist-db@1.2.3(browserslist@4.28.2): + dependencies: + browserslist: 4.28.2 + escalade: 3.2.0 + picocolors: 1.1.1 + optional: true + uri-js@4.4.1: dependencies: punycode: 2.3.1 @@ -4629,7 +4691,7 @@ snapshots: '@webassemblyjs/wasm-parser': 1.14.1 acorn: 8.16.0 acorn-import-attributes: 1.9.5(acorn@8.16.0) - browserslist: 4.28.1 + browserslist: 4.28.2 chrome-trace-event: 1.0.4 enhanced-resolve: 5.20.1 es-module-lexer: 1.7.0 diff --git a/uv.lock b/uv.lock index 116b30f9f..3b5e7df92 100644 --- a/uv.lock +++ b/uv.lock @@ -756,7 +756,7 @@ wheels = [ [[package]] name = "django-filingcabinet" version = "0.0.1" -source = { git = "https://github.com/okfde/django-filingcabinet.git?rev=main#e15f2199b19178ae9b0dd42a994829bc04634bac" } +source = { git = "https://github.com/okfde/django-filingcabinet.git?rev=main#8ffb53086b0150a96778eb11adea95428184d8c8" } dependencies = [ { name = "celery" }, { name = "django" },