Fix some bugs.

Author: frjo

hypha/addressfield/fields.py

@@ -3,7 +3,7 @@
 
 from django import forms
 from django.core.exceptions import ValidationError
-from django.utils.translation import gettext as _
+from django.utils.translation import gettext_lazy as _
 
 from .widgets import AddressWidget
 
@@ -60,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/models.py

@@ -12,8 +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
+from django.utils.translation import gettext_lazy as _
 
 from hypha.apply.utils.storage import PrivateStorage
 
@@ -177,8 +176,8 @@ class ActivityAttachment(models.Model):
     )
 
     class Meta:
-        verbose_name = gettext_lazy("activity attachment")
-        verbose_name_plural = gettext_lazy("activity attachments")
+        verbose_name = _("activity attachment")
+        verbose_name_plural = _("activity attachments")
 
     @property
     def filename(self):
@@ -206,9 +205,9 @@ 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(gettext_lazy("message"))
+    message = models.TextField(_("message"))
     visibility = models.CharField(
-        gettext_lazy("visibility"),
+        _("visibility"),
         choices=list(VISIBILITY.items()),
         default=APPLICANT,
         max_length=30,
@@ -240,8 +239,8 @@ class Activity(models.Model):
     class Meta:
         ordering = ["-timestamp"]
         base_manager_name = "objects"
-        verbose_name = gettext_lazy("activity")
-        verbose_name_plural = gettext_lazy("activities")
+        verbose_name = _("activity")
+        verbose_name_plural = _("activities")
 
     def get_absolute_url(self):
         # coverup for both submission and project as source.
@@ -341,8 +340,8 @@ class Event(models.Model):
     source = GenericForeignKey("content_type", "object_id")
 
     class Meta:
-        verbose_name = gettext_lazy("event")
-        verbose_name_plural = gettext_lazy("events")
+        verbose_name = _("event")
+        verbose_name_plural = _("events")
 
     def __str__(self):
         if self.source and hasattr(self.source, "title"):
@@ -380,8 +379,8 @@ class Message(models.Model):
     objects = MessagesQueryset.as_manager()
 
     class Meta:
-        verbose_name = gettext_lazy("message")
-        verbose_name_plural = gettext_lazy("messages")
+        verbose_name = _("message")
+        verbose_name_plural = _("messages")
 
     def __str__(self):
         return f"[{self.type}][{self.status}] {self.content}"

hypha/apply/funds/admin_forms.py

@@ -24,13 +24,16 @@ def clean(self):
         if number_of_stages == 1:
             self.validate_stages_equal_forms(workflow, application_forms)
         self.validate_stages_equal_forms(
-            workflow, review_forms, form_type="Review form"
+            workflow, review_forms, form_type=_("Review form")
         )
         self.validate_stages_equal_forms(
-            workflow, external_review_forms, form_type="External Review form"
+            workflow,
+            external_review_forms,
+            form_type=_("External review form"),
+            optional=True,
         )
         self.validate_stages_equal_forms(
-            workflow, determination_forms, form_type="Determination form"
+            workflow, determination_forms, form_type=_("Determination form")
         )
 
         if settings.PROJECTS_ENABLED:
@@ -68,7 +71,9 @@ def validate_application_forms(self, workflow, forms):
                     error_list,
                 )
 
-    def validate_stages_equal_forms(self, workflow, forms, form_type=None):
+    def validate_stages_equal_forms(
+        self, workflow, forms, form_type=None, optional=False
+    ):
         if form_type is None:
             form_type = _("form")
 
@@ -81,7 +86,7 @@ def validate_stages_equal_forms(self, workflow, forms, form_type=None):
             plural_stage = "s" if number_of_stages > 1 else ""
 
             # External Review Form is optional and should be single if provided
-            if form_type == _("External Review form"):
+            if optional:
                 if number_of_forms > 1:
                     self.add_error(
                         None,

hypha/apply/funds/blocks.py

@@ -2,6 +2,7 @@
 
 from django import forms
 from django.utils.formats import get_format
+from django.utils.text import format_lazy
 from django.utils.translation import gettext_lazy as _
 from django.utils.translation import ngettext_lazy
 from wagtail import blocks
@@ -228,13 +229,13 @@ class DurationBlock(ApplicationSingleIncludeFieldBlock):
         (MONTHS, _("Months")),
     )
     DURATION_DAY_OPTIONS = {
-        i: ngettext_lazy("{} day", "{} days", i).format(i) for i in range(1, 8)
+        i: format_lazy(ngettext_lazy("{} day", "{} days", i), i) for i in range(1, 8)
     }
     DURATION_WEEK_OPTIONS = {
-        i: ngettext_lazy("{} week", "{} weeks", i).format(i) for i in range(1, 13)
+        i: format_lazy(ngettext_lazy("{} week", "{} weeks", i), i) for i in range(1, 13)
     }
     DURATION_MONTH_OPTIONS = {
-        i: ngettext_lazy("{} month", "{} months", i).format(i)
+        i: format_lazy(ngettext_lazy("{} month", "{} months", i), i)
         for i in [*range(1, 13), 18, 24, 36]
     }
     field_class = forms.ChoiceField

hypha/apply/funds/migrations/0103_alter_screeningstatus.py

@@ -12,7 +12,7 @@ class Migration(migrations.Migration):
         migrations.AlterModelOptions(
             name="screeningstatus",
             options={
-                "verbose_name": "Screening Decision",
+                "verbose_name": "Screening decision",
                 "verbose_name_plural": "screening decisions",
             },
         ),

hypha/apply/funds/models/screening.py

@@ -20,7 +20,7 @@ class ScreeningStatus(models.Model):
     base_form_class = ScreeningStatusAdminForm
 
     class Meta:
-        verbose_name = _("Screening Decision")
+        verbose_name = _("Screening decision")
         verbose_name_plural = _("screening decisions")
 
     def __str__(self):