i18n + l10n de

Author: bikubi

froide/account/forms.py

@@ -141,13 +141,15 @@ class NewUserBaseForm(AddressBaseForm):
             required=False,
             initial=False,
             widget=BootstrapRadioSelect,
-            label=_("For journalists"),
+            label=_("{site_name} for journalists").format(site_name=settings.SITE_NAME),
             help_text=_(
-                "You work in journalism and would like to use this platform for your research? Shortly after your sign-up is completed, we will send you additional information about extra functionality for journalists."
+                _(
+                    "You work in journalism and would like to use {site_name} for your research? Shortly after your sign-up is completed, we will send you additional information about extra functionality for journalists."
+                ).format(site_name=settings.SITE_NAME)
             ),
             choices=[
-                (False, _("No, I am not a journalist")),
-                (True, _("Yes, I am a journalist")),
+                (False, _("No, I am <strong>not a journalist</strong>")),
+                (True, _("Yes, I am <strong>a journalist</strong>")),
             ],
             coerce=lambda x: x and (x.lower() != "false"),
         )
@@ -160,11 +162,13 @@ class NewUserBaseForm(AddressBaseForm):
             widget=BootstrapRadioSelect,
             label=_("Hide my name from public view"),
             choices=[
-                # TODO i18n
-                # TODO <b>plain text
-                (False, "My name may appear on the website in plain text"),
-                # TODO <b>redacted
-                (True, "My name must be redacted"),
+                (
+                    False,
+                    _(
+                        "My name may appear on the website in <strong>plain text</strong>"
+                    ),
+                ),
+                (True, _("My name must be <strong>redacted</strong>")),
             ],
             coerce=lambda x: x and (x.lower() != "false"),
         )

froide/foirequest/api_views/request.py

@@ -1,5 +1,6 @@
 from django.contrib.auth import get_user_model
 from django.db.models import Q
+from django.utils.translation import gettext_lazy as _
 
 from django_filters import rest_framework as filters
 from rest_framework import mixins, permissions, status, throttling, viewsets
@@ -79,11 +80,10 @@ class FoiRequestFilter(filters.FilterSet):
         queryset=filter_by_authenticated_user_queryset, method="follower_filter"
     )
     costs = filters.RangeFilter()
-    # TODO i18n
     campaign = filters.ModelChoiceFilter(
         queryset=Campaign.objects.filter(public=True),
         null_value="-",
-        null_label="No Campaign",
+        null_label=_("no campaign"),
         lookup_expr="isnull",
         method="campaign_filter",
     )

froide/foirequest/forms/request.py

@@ -68,12 +68,15 @@ class RequestForm(JSONMixin, forms.Form):
         choices=[
             (
                 True,
-                # TODO i18n
-                "Die Anfrage soll sofort öffentlich auf dieser Website erscheinen. (Standardeinstellung)",
+                _(
+                    "I want the request to be immediately accessible to the <strong>public</strong> on this website. (Default)"
+                ),
             ),
             (
                 False,
-                "Die Anfrage soll vorerst nicht öffentlich auf dieser Website erscheinen, sondern erst später veröffentlicht werden.",
+                _(
+                    "I want the request to remain <strong>not public</strong> for now, and publish it later."
+                ),
             ),
         ],
         coerce=lambda x: x and (x.lower() != "false"),

froide/foirequest/templates/foirequest/request.html

@@ -68,10 +68,7 @@
                                      alt=""
                                      class="campaign-logo d-block object-fit-contain w-100 mb-3" />
                             {% endif %}
-                            <h2 class="fs-4">
-                                Mitmachen bei {# TODO i18n #}
-                                {{ campaign.name }}
-                            </h2>
+                            <h2 class="fs-4">{% blocktrans with name=campaign.name %}Participate in {{ name }}{% endblocktrans %}</h2>
                             {% if campaign.short_description %}<div class="fs-6">{{ campaign.short_description|markdown }}</div>{% endif %}
                             <div class="mt-auto">
                                 <a href="{{ campaign.url }}" class="btn btn-primary w-100">{% trans "Make a request" %}</a>
@@ -114,23 +111,18 @@ <h2>{% blocktrans %}Write the request{% endblocktrans %}</h2>
         <template data-slot="loginlink">
             <a href="{% url 'account-login' %}?next={{ request.get_full_path|urlencode }}">{% trans "Zum Login" %}</a>
         </template>
+        <template data-slot="user-public-preamble">
+            {% blocktrans %}<p>Your name will be sent to public bodies. If you want to remain anonymous to the public, you can choose to not display your name on the website. Your name will then be redacted.</p>{% endblocktrans %}
+        </template>
         <template data-slot="request-public-preamble">
-            {% blocktrans %}
-            <p>Ihre Anfrage ist für alle auf dieser Website sichtbar.
-              Denn Sie tragen mit Ihrer Anfrage zu einem öffentlichen Archiv amtlicher Informationen bei und sorgen so mit einer wachsenden Community für Transparenz in Politik und Verwaltung.</p>
-            <p>Auf Wunsch können Sie Ihre Anfrage aber erst später öffentlich machen, z.B. nach Veröffentlichung Ihrer investigativen Recherche.</p>
-            {% endblocktrans %}
+            {% blocktrans %}<p>Your request is accesible for everybody on this website. With your request, you contribute to a public archive of official information. You are part of a growing community that strives for transparency in politics and adminstration.</p><p>You can opt into publishing your request later, e.g. after the disclosure of your investigation or research.</p>{% endblocktrans %}
         </template>
         <template data-slot="request-public-postamble">
             {% if request.user.is_authenticated %}
                 {% url 'account-settings' as profile_url %}
-                {% blocktrans with profilelink=profile_url %}
-                    Ob Ihr Name im Klartext erscheinen sollen, können Sie <a target="_blank" href="{{ profile_url }}">in ihrem Profil</a> anpassen.
-                {% endblocktrans %}
+                {% blocktrans with profilelink=profile_url %}In your <a target="_blank" href="{{ profile_url }}">profile settings</a> you can decide whether to your name should be redacted.{% endblocktrans %}
             {% else %}
-                {% blocktrans %}
-                    Ihre Entscheidung hier hat keinen Einfluss darauf ob ihr Name im Klartext erscheinen soll (wie zuvor festgelegt).
-                {% endblocktrans %}
+                {% blocktrans %}Your decision here does not affect whether your name will appear in plain text or redacted (as you have decided previously).{% endblocktrans %}
             {% endif %}
         </template>
         </request-page>

froide/foirequest/templates/foirequest/snippets/request_user_confirm.html

@@ -1,5 +1,2 @@
 {% load i18n %}
-{# TODO i18n #}
-{% blocktrans %}
-Ich versichere, dass ich <strong>keine persönlichen Informationen über mich selbst anfrage.</strong>
-{% endblocktrans %}
+{% blocktrans %}I confirm that I am <strong>not requesting personal information</strong> about myself.{% endblocktrans %}

froide/foirequest/views/make_request.py

@@ -203,11 +203,14 @@ def get_js_context(self):
                 "requests": _("requests"),
                 "close": _("close"),
                 "back": _("Back"),
-                # TODO i18n
-                "stepNext": _("Next"),  # pgettext("Make request", "Next"),
+                "stepNext": _("Next"),
                 "step": _("Step"),
                 "introduction": _("Introduction"),
                 "similarRequests": _("Similar requests"),
+                "findSimilarRequests": _("Find similar requests"),
+                "currentlyChosen": _("Currently chosen:"),
+                "requestVisibility": _("Public visibility of the request"),
+                "previewAndSubmit": _("Preview & submit"),
                 "address": _("Address"),
                 "account": pgettext("Make request breadcrumbs/stepper", "Account"),
                 "writeMessage": _("Write message"),
@@ -229,6 +232,7 @@ def get_js_context(self):
                 ),
                 "selectPublicBodies": _("Select public bodies"),
                 "continue": _("continue"),
+                "continueWithSelected": _("Continue with selected"),
                 "selectAll": [_("select one"), _("select all")],
                 "selectingAll": _("Selecting all public bodies, please wait..."),
                 "name": _("Name"),
@@ -346,6 +350,65 @@ def get_js_context(self):
                         count="${count}"
                     ),
                 ],
+                "results": [
+                    _("One result"),
+                    _("{count} results").format(count="${count}"),
+                ],
+                "createAccount": _("Create account"),
+                "createAccountPreamble": _(
+                    "You need to create an account at {site_name} so you will be able to manage your request."
+                ).format(site_name=settings.SITE_NAME),
+                "skipIntroHowto": _(
+                    "Skip this part next time and start at “Choose public body” (optional)"
+                ),
+                "error": _("Error"),
+                "none": _("None chosen"),
+                "toPb": _("To:"),
+                "to": _("to"),
+                "requestTo": _("Request to:"),
+                "correct": _("Correct"),
+                "fixPlaceholder": _("Fix placeholders automatically"),
+                "updatePostalAddress": _("Update my postal address"),
+                "subjectMeaningful": _("Please write a meaningful subject"),
+                "containsPlaceholderMarker": _(
+                    "The body contains an illegal placeholder ({placeholder})."
+                ).format(placeholder="${placeholder}"),
+                "pagination": _("Pagination"),
+                "publicbody": _("Public body"),
+                "requestBody": _("Request body"),
+                "request": _("request"),
+                "visibility": _("Visibility"),
+                "notConfirmed": _("Not confirmed"),
+                "notAgreed": _("Not agreed"),
+                "publishNow": _("Publish request now"),
+                "publishLater": _("Publish request later"),
+                "help": _("Help"),
+                "privacy": _("Privacy"),
+                "privacyMoreInfo": _("More information about privacy on this website"),
+                "nameRedact": _("My name must be <strong>redacted</strong>"),
+                "namePlainText": _(
+                    "My name may appear on the website in <strong>plain text</strong>"
+                ),
+                "email": _("Email"),
+                "notSentToPb": _("(not sent to public body)"),
+                "terms": _("Terms of Use"),
+                "searchToPbName": _("to %(name)s") % {"name": "${name}"},
+                "searchToProject": _(
+                    'to <a href="%(url)s">%(name)s</a> and <a href="%(urlp)s">%(count)s other public bodies</a>'
+                )
+                % {
+                    "name": "${name}",
+                    "url": "${url}",
+                    "urlp": "${urlp}",
+                    "count": "${count}",
+                },
+                "notYetSet": _("Not yet set"),
+                "searchSelectThisPb": _("Select this public body"),
+                "dateRange": _("Date range"),
+                "dateRangeFrom": _("From"),
+                "dateRangeTo": _("Until"),
+                "campaign": _("Campaign"),
+                "toggleCollapse": _("Toggle collapse"),
             },
             "regex": {
                 "greetings": [_("Dear Sir or Madam")],