diff --git a/froide/foirequest/foi_mail.py b/froide/foirequest/foi_mail.py index 434e0407d..0105d8ed2 100644 --- a/froide/foirequest/foi_mail.py +++ b/froide/foirequest/foi_mail.py @@ -187,7 +187,7 @@ def __init__(self, *args, foirequest=None, **kwargs): super().__init__(*args, **kwargs) -def _deliver_mail(email: ParsedEmail, mail_bytes=None, manual=False): +def 0_deliver_mail(email: ParsedEmail, mail_bytes=None, manual=False): received_list = ( email.to + email.cc + email.resent_to + email.resent_cc + email.x_original_to ) diff --git a/froide/foirequest/views/message.py b/froide/foirequest/views/message.py index 3c76a17b4..89a1b2ad3 100644 --- a/froide/foirequest/views/message.py +++ b/froide/foirequest/views/message.py @@ -227,12 +227,12 @@ def edit_postal_message(request, foirequest, message_id): "uppy": get_uppy_i18n(), # from publicbody/widgets "missingPublicBody": _("Are we missing a public agency?"), - "publicBodySearchPlaceholder": _("Ministry of..."), + "publicBodySearchPlaceholder": _("Department of..."), "search": _("Search"), "searchPublicBodyLabel": _("Search for public authorities"), "examples": _("Examples:"), "environment": _("Environment"), - "ministryOfLabour": _("Ministry of Labour"), + "ministryOfLabour": _("Department of Labor"), "or": _("or"), "noPublicBodiesFound": _("No Public Agencies found for this query."), "letUsKnow": _("Please let us know!"), diff --git a/froide/locale/de/LC_MESSAGES/django.po b/froide/locale/de/LC_MESSAGES/django.po index 2adba94df..dda9c7f91 100644 --- a/froide/locale/de/LC_MESSAGES/django.po +++ b/froide/locale/de/LC_MESSAGES/django.po @@ -12156,7 +12156,7 @@ msgstr "" #~ msgid "" #~ "Freedom of Information Request\n" #~ "\n" -#~ " To: Ministry of Interior\n" +#~ " To: Department of Interior\n" #~ "\n" #~ " Dear Sir or Madam,\n" #~ " I request information about the following:\n" diff --git a/froide/publicbody/templates/publicbody/widget/_add_js_vars.html b/froide/publicbody/templates/publicbody/widget/_add_js_vars.html index 182df23d4..b42642635 100644 --- a/froide/publicbody/templates/publicbody/widget/_add_js_vars.html +++ b/froide/publicbody/templates/publicbody/widget/_add_js_vars.html @@ -12,11 +12,11 @@ (function () { var i18n = { missingPublicBody: '{% trans "Are we missing a public agency?" %}', - publicBodySearchPlaceholder: '{% trans "Ministry of..." %}', + publicBodySearchPlaceholder: '{% trans "Department of..." %}', search: '{% trans "Search" %}', examples: '{% trans "Examples:" %}', environment: '{% trans "Environment" %}', - ministryOfLabour: '{% trans "Ministry of Labour" %}', + ministryOfLabour: '{% trans "Department of Labor" %}', or: '{% trans "or" %}', noPublicBodiesFound: '{% trans "No Public Agencies found for this query." %}', letUsKnow: '{% trans "Please let us know!" %}' diff --git a/froide/publicbody/widgets.py b/froide/publicbody/widgets.py index a12200847..89f47bc1e 100644 --- a/froide/publicbody/widgets.py +++ b/froide/publicbody/widgets.py @@ -19,12 +19,12 @@ def get_widget_context(): }, "i18n": { "missingPublicBody": _("Are we missing a public agency?"), - "publicBodySearchPlaceholder": _("Ministry of..."), + "publicBodySearchPlaceholder": _("Department of..."), "search": _("Search"), "searchPublicBodyLabel": _("Search for public authorities"), "examples": _("Examples:"), "environment": _("Environment"), - "ministryOfLabour": _("Ministry of Labour"), + "ministryOfLabour": _("Department of Labor"), "or": _("or"), "noPublicBodiesFound": _("No Public Agencies found for this query."), "letUsKnow": _("Please let us know!"), diff --git a/froide/templates/snippets/homepage_hero.html b/froide/templates/snippets/homepage_hero.html index a29ee4de8..766a3f265 100644 --- a/froide/templates/snippets/homepage_hero.html +++ b/froide/templates/snippets/homepage_hero.html @@ -77,7 +77,7 @@

{% else %}
{% blocktrans %}Freedom of Information Request - To: Ministry of Interior + To: Department of Labor Dear Sir or Madam, I request information about the following: