Simplification.

Author: frjo

hypha/apply/funds/services.py

@@ -16,7 +16,6 @@
 from django.db.models.functions import Coalesce
 from django.http import HttpRequest
 from django.utils.translation import gettext as _
-from django.utils.translation import ngettext
 
 from hypha.apply.activity.messaging import MESSAGES, messenger
 from hypha.apply.activity.models import Activity, Event
@@ -43,9 +42,7 @@ def bulk_archive_submissions(
 
     messages.success(
         request,
-        ngettext(
-            "{} submission archived.", "{} submissions archived.", len(submissions)
-        ).format(len(submissions)),
+        _("{count} submissions archived.").format(count=len(submissions)),
     )
 
     messenger(
@@ -78,9 +75,7 @@ def bulk_delete_submissions(
 
     messages.success(
         request,
-        ngettext(
-            "{} submission deleted.", "{} submissions deleted.", len(submissions)
-        ).format(len(submissions)),
+        _("{count} submissions deleted.").format(count=len(submissions)),
     )
 
     messenger(

hypha/apply/projects/tables.py

@@ -6,8 +6,8 @@
 from django.utils.html import format_html
 from django.utils.safestring import mark_safe
 from django.utils.text import slugify
+from django.utils.translation import gettext
 from django.utils.translation import gettext_lazy as _
-from django.utils.translation import ngettext
 from django_tables2.utils import A
 from heroicons.templatetags.heroicons import heroicon_outline
 
@@ -213,9 +213,7 @@ def render_reporting(self, record):
             display = ""
 
         outstanding_count = record.report_config.outstanding_reports()
-        display += ngettext(
-            "{} outstanding", "{} outstanding", outstanding_count
-        ).format(outstanding_count)
+        display += gettext("{count} outstanding").format(count=outstanding_count)
         return mark_safe(display)
 
 

hypha/apply/review/forms.py

@@ -161,7 +161,7 @@ def clean(self):
         valid_opinions = [opinion for opinion in opinions if opinion is not None]
         if len(valid_opinions) > 1:
             self.add_error(
-                None, gettext("Cant submit both an agreement and disagreement")
+                None, gettext("Can't submit both an agreement and disagreement")
             )
         cleaned_data = {"opinion": valid_opinions[0]}
         return cleaned_data