Add missing translated strings (#4789)

(This contribution was sponsored by
[DigitalHub.sh](https://digitalhub.sh/))

Fixes #4753

I've split this PR over several commits which are mostly independent of
each other. I'm happy to open separate PRs if you think that'd be easier
to review.

## Explanations of the separate commits

### Mark missing strings for translation

After a few unsuccessful attempts at scripting the identification of
untranslated strings, I ended up reviewing all Python files manually.

The command I used to identify the relevant files was:
```
git ls-files -z '**.py' ':!**/migrations/*.py' ':!**/urls.py' ':!hypha/settings/*.py' ':!docs/*' ':!**/test*.py' | find -files0-from - -not -empty
```
(That's all Python files, but excluding stuff like migrations, settings,
... (and empty files))


This change should have no impact for a site running the English version
of Hypha.


### Add missing strings for translations (templates)

Similar to the previous commit, I ended up reviewing all templates
manually (`git ls-files '*.html'`), adding `{% trans %}`, `{% blocktrans
%}`, or `_(...)` where needed.

Again, this change should have no impact.

### Add trimmed option to blocktranslate

This removes irrelevant whitespace in source strings, making it a bit
nicer.

I used `git grep blocktrans | grep -vw trimmed | grep -v endblocktrans`
to identify uses of `{% blocktrans %}` without the `trimmed` argument,
excluding lines that also included `{% endblocktrans %}` on the same
line.

This is technically a breaking change, but it only introduces whitespace
changes to HTML templates, which is irrelevant.

### Use `{% blocktranslate trimmed %}` to break down long lines

This one just makes templates a little bit more readable as it breaks
very long lines into more manageable pieces.

Again, it can introduce whitespace changes to the HTML, but should not
have any effect to the source strings.

### Added `verbose_name` and `verbose_name_plural` to all models

Some models already has a translated `verbose_name` or
`verbose_name_plural`, but it was inconsistent (and quite rare). This
change adds these attributes to all models.

I used `git ls-files '**/models/*.py'` and ` git ls-files
'**/models.py'` to find all models, then went through the files manually
to add the missing `verbose_name` and `verbose_name_plural`.

I decided to omit the plural form for model classes inheriting from
`BaseSiteSettings` since it didn't seem to make sense.

I also opted to use lower case (like `_("foo bar")` for model `FooBar`)
to match Django's own default behavior, but I used `Foo Bar` in a few
instances where the model already had a `verbose_name` that used
titlecase.

## Next steps

I ran out of time to complete all my objectives and I've still got some
translation-related tasks I wanted to get to. I'm happy to open issues
for these if you think they're relevant:

* #4752 Fix missing translations in javascript files: I found about 10
instances but fixing them would require either using the [Django
javascript translation
functions,](https://docs.djangoproject.com/en/6.0/topics/i18n/translation/#internationalization-in-javascript-code)
or moving the strings to the HTML (data attributes for example).
* #4753 Add explicit `verbose_name` to all declared model fields (and
maybe form fields as well). This can probably be scripted somewhat,
ideally with a linter that would catch the introducing of future
untranslated strings.
* Review cases where `gettext` is used at the module level instead of
`gettext_lazy` as this could indicate some possible bugs (visible in a
multi-language setup where the user is not using the default language).
* Fix translations that build up a sentence word by word, as this
doesn't really work in practice. Something like `{% trans "Application"
%} {{ application_id }} {% trans "updated on" %} {{ date }} {% trans
"by" %} {{ author.name }}` should be rewritten to have the whole
sentence in a single `blocktrans`, or when not possible small words like
`by` should be given a context because they're likely to be translated
differently for different sentences.

---------

Co-authored-by: Baptiste Mispelon <baptiste.mispelon@torchbox.com>

Author: frjo

hypha/addressfield/fields.py

@@ -3,6 +3,7 @@
 
 from django import forms
 from django.core.exceptions import ValidationError
+from django.utils.translation import gettext_lazy as _
 
 from .widgets import AddressWidget
 
@@ -49,7 +50,7 @@ def clean(self, value, **kwargs):
         try:
             country_data = self.data[country]
         except KeyError:
-            raise ValidationError("Invalid country selected") from None
+            raise ValidationError(_("Invalid country selected")) from None
 
         fields = flatten_data(country_data["fields"])
 
@@ -59,7 +60,9 @@ def clean(self, value, **kwargs):
         if missing_fields:
             missing_field_name = [fields[field]["label"] for field in missing_fields]
             raise ValidationError(
-                "Please provide data for: {}".format(", ".join(missing_field_name))
+                _("Please provide data for: {fields}").format(
+                    fields=", ".join(missing_field_name)
+                )
             )
 
         return super().clean(value, **kwargs)

hypha/apply/activity/adapters/activity_feed.py

@@ -293,9 +293,9 @@ def handle_report_frequency(self, config, **kwargs):
 
     def handle_skipped_report(self, report, **kwargs):
         if report.skipped:
-            return "Skipped a Report"
+            return _("Skipped a Report")
         else:
-            return "Marked a Report as required"
+            return _("Marked a Report as required")
 
     def handle_update_invoice_status(self, invoice, **kwargs):
         base_message = _("Updated Invoice status to: {invoice_status}.")

hypha/apply/activity/adapters/base.py

@@ -1,5 +1,6 @@
 from django.conf import settings
 from django.contrib import messages
+from django.utils.translation import gettext as _
 
 from hypha.apply.activity.options import MESSAGES
 
@@ -192,11 +193,13 @@ def process_send(
 
             if not settings.SEND_MESSAGES:
                 if recipient:
-                    debug_message = "{} [to: {}]: {}".format(
-                        self.adapter_type, recipient, message
+                    debug_message = _("{adapter} [to: {recipient}]: {message}").format(
+                        adapter=self.adapter_type, recipient=recipient, message=message
                     )
                 else:
-                    debug_message = "{}: {}".format(self.adapter_type, message)
+                    debug_message = _("{adapter}: {message}").format(
+                        adapter=self.adapter_type, message=message
+                    )
                 messages.add_message(request, messages.DEBUG, debug_message)
 
     def create_logs(self, message, recipient, *events):

hypha/apply/activity/forms.py

@@ -30,11 +30,13 @@ class Meta:
             "assign_to",
         )
         labels = {
-            "visibility": "Visible to",
-            "message": "Message",
+            "visibility": _("Visible to"),
+            "message": _("Message"),
         }
         help_texts = {
-            "visibility": "Select a relevant user role. Staff can view every comment."
+            "visibility": _(
+                "Select a relevant user role. Staff can view every comment."
+            )
         }
         widgets = {
             "visibility": forms.RadioSelect(),

hypha/apply/activity/migrations/0091_alter_activity_options_and_more.py

@@ -0,0 +1,56 @@
+# Generated by Django 5.2.13 on 2026-04-13 08:22
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("activity", "0090_alter_activity_visibility_alter_event_type"),
+    ]
+
+    operations = [
+        migrations.AlterModelOptions(
+            name="activity",
+            options={
+                "base_manager_name": "objects",
+                "ordering": ["-timestamp"],
+                "verbose_name": "activity",
+                "verbose_name_plural": "activities",
+            },
+        ),
+        migrations.AlterModelOptions(
+            name="activityattachment",
+            options={
+                "verbose_name": "activity attachment",
+                "verbose_name_plural": "activity attachments",
+            },
+        ),
+        migrations.AlterModelOptions(
+            name="event",
+            options={"verbose_name": "event", "verbose_name_plural": "events"},
+        ),
+        migrations.AlterModelOptions(
+            name="message",
+            options={"verbose_name": "message", "verbose_name_plural": "messages"},
+        ),
+        migrations.AlterField(
+            model_name="activity",
+            name="message",
+            field=models.TextField(verbose_name="message"),
+        ),
+        migrations.AlterField(
+            model_name="activity",
+            name="visibility",
+            field=models.CharField(
+                choices=[
+                    ("applicant", "Applicants"),
+                    ("team", "Staff only"),
+                    ("reviewers", "Reviewers"),
+                    ("all", "All"),
+                ],
+                default="applicant",
+                max_length=30,
+                verbose_name="visibility",
+            ),
+        ),
+    ]

hypha/apply/activity/models.py

@@ -12,7 +12,7 @@
 from django.urls import reverse
 from django.utils import timezone
 from django.utils.text import get_valid_filename
-from django.utils.translation import gettext as _
+from django.utils.translation import gettext_lazy as _
 
 from hypha.apply.utils.storage import PrivateStorage
 
@@ -26,13 +26,10 @@
     ACTION: _("Action"),
 }
 
-# Visibility strings. Used to determine visibility states but are also
-# sometimes shown to users.
-# (ie. hypha.apply.activity.templatetags.activity_tags.py)
-APPLICANT = _("applicant")
-TEAM = _("team")
-REVIEWER = _("reviewers")
-ALL = _("all")
+APPLICANT = "applicant"
+TEAM = "team"
+REVIEWER = "reviewers"
+ALL = "all"
 
 # Visibility choice strings
 VISIBILITY = {
@@ -175,6 +172,10 @@ class ActivityAttachment(models.Model):
         upload_to=get_attachment_upload_path, storage=PrivateStorage()
     )
 
+    class Meta:
+        verbose_name = _("activity attachment")
+        verbose_name_plural = _("activity attachments")
+
     @property
     def filename(self):
         return os.path.basename(self.file.name)
@@ -201,9 +202,12 @@ class Activity(models.Model):
     source_object_id = models.PositiveIntegerField(blank=True, null=True, db_index=True)
     source = GenericForeignKey("source_content_type", "source_object_id")
 
-    message = models.TextField()
+    message = models.TextField(_("message"))
     visibility = models.CharField(
-        choices=list(VISIBILITY.items()), default=APPLICANT, max_length=30
+        _("visibility"),
+        choices=list(VISIBILITY.items()),
+        default=APPLICANT,
+        max_length=30,
     )
 
     # Fields for handling versioning of the comment activity models
@@ -232,6 +236,8 @@ class Activity(models.Model):
     class Meta:
         ordering = ["-timestamp"]
         base_manager_name = "objects"
+        verbose_name = _("activity")
+        verbose_name_plural = _("activities")
 
     def get_absolute_url(self):
         # coverup for both submission and project as source.
@@ -330,6 +336,10 @@ class Event(models.Model):
     object_id = models.PositiveIntegerField(blank=True, null=True)
     source = GenericForeignKey("content_type", "object_id")
 
+    class Meta:
+        verbose_name = _("event")
+        verbose_name_plural = _("events")
+
     def __str__(self):
         if self.source and hasattr(self.source, "title"):
             return f"{self.by} {self.get_type_display()} - {self.source.title}"
@@ -365,6 +375,10 @@ class Message(models.Model):
     sent_in_email_digest = models.BooleanField(default=False)
     objects = MessagesQueryset.as_manager()
 
+    class Meta:
+        verbose_name = _("message")
+        verbose_name_plural = _("messages")
+
     def __str__(self):
         return f"[{self.type}][{self.status}] {self.content}"
 

hypha/apply/activity/options.py

@@ -1,5 +1,5 @@
 from django.db.models import TextChoices
-from django.utils.translation import gettext as _
+from django.utils.translation import gettext_lazy as _
 
 
 class MESSAGES(TextChoices):

hypha/apply/activity/templates/activity/include/activity_list.html

@@ -21,7 +21,7 @@
                     hx-target="this"
                     hx-swap="outerHTML transition:true"
                     hx-select=".h-timeline"
-                >Show more...</a>
+                >{% trans "Show more..." %}</a>
             {% endif %}
         </div>
 

hypha/apply/activity/templates/activity/ui/activity-comment-item.html

@@ -25,7 +25,7 @@
                                     {% for role in activity.user.get_role_names  %}
                                         <span
                                             class="inline-block py-0.5 px-2 text-sm font-semibold rounded-xl border border-gray-300 text-fg-muted"
-                                            data-tippy-content="This user is a {{ role }}"
+                                            data-tippy-content="{% blocktrans %}This user is a {{ role }}{% endblocktrans %}"
                                         >
                                             {{ role }}
                                         </span>
@@ -34,7 +34,7 @@
                             {% endif %}
 
                             <a href="#communications--{{activity.id}}" class="hover:underline">
-                                <span class="text-fg-muted">commented</span>
+                                <span class="text-fg-muted">{% trans "commented" %}</span>
                                 <relative-time
                                     class="text-fg-muted"
                                     datetime="{{ activity.timestamp|date:"c" }}"
@@ -58,7 +58,7 @@
 
                             {% with activity.visibility|visibility_display:request.user as visibility_text  %}
                                 <span class="flex gap-1 items-center py-0.5 px-1.5 text-xs uppercase rounded-xl border border-gray-300 text-fg-muted"
-                                      data-tippy-content="This is visible to {{ visibility_text }}">
+                                      data-tippy-content="{% blocktrans %}This is visible to {{ visibility_text }}{% endblocktrans %}">
                                     {% heroicon_outline "eye" size=14 class="inline" aria_hidden=true %}
                                     {{ visibility_text }}
                                 </span>
@@ -69,7 +69,7 @@
                             <a
                                 hx-get="{% url 'activity:edit-comment' activity.id %}"
                                 hx-target="#text-comment-{{activity.id}}"
-                                title="{% trans "Edit comment" %}"
+                                title="{% trans 'Edit comment' %}"
                                 class="btn btn-sm btn-square btn-ghost"
                             >
                                 {% heroicon_micro "pencil-square" aria_hidden=true %}
@@ -81,8 +81,8 @@
                             <a
                                 hx-delete="{% url 'activity:delete-comment' activity.id %}"
                                 hx-target="#communications-wrapper--{{activity.id}}"
-                                hx-confirm="{% trans "Are you sure you want to delete this comment? This action cannot be undone." %}"
-                                title="{% trans "Delete comment" %}"
+                                hx-confirm="{% trans 'Are you sure you want to delete this comment? This action cannot be undone.' %}"
+                                title="{% trans 'Delete comment' %}"
                                 class="btn btn-error btn-sm btn-square btn-ghost"
                             >
                                 {% heroicon_micro "trash" class="opacity-80 size-4" aria_hidden=true %}

hypha/apply/activity/views.py

@@ -3,6 +3,7 @@
 from django.core.paginator import Paginator
 from django.shortcuts import get_object_or_404, render
 from django.utils.decorators import method_decorator
+from django.utils.translation import gettext as _
 from django.views.decorators.http import require_http_methods
 from django.views.generic import ListView
 from rolepermissions.checkers import has_object_permission
@@ -57,10 +58,10 @@ def edit_comment(request, pk):
     activity = get_object_or_404(Activity, id=pk)
 
     if activity.type != COMMENT or activity.user != request.user:
-        raise PermissionError("You can only edit your own comments")
+        raise PermissionDenied(_("You can only edit your own comments"))
 
     if activity.deleted:
-        raise PermissionError("You can not edit a deleted comment")
+        raise PermissionDenied(_("You can not edit a deleted comment"))
 
     if request.GET.get("action") == "cancel":
         return render(
@@ -88,10 +89,10 @@ def delete_comment(request, pk):
     activity = get_object_or_404(Activity, id=pk)
 
     if activity.type != COMMENT or activity.user != request.user:
-        raise PermissionError("You can only delete your own comments")
+        raise PermissionDenied(_("You can only delete your own comments"))
 
     if activity.deleted:
-        raise PermissionError("You can not delete a deleted comment")
+        raise PermissionDenied(_("You can not delete a deleted comment"))
 
     if request.method == "DELETE":
         activity = services.delete_comment(activity)