From 2645fc8deb3f4bb018f4c1b486eae678988455c6 Mon Sep 17 00:00:00 2001
From: Fredrik Jonsson <frjo@xdeb.org>
Date: Wed, 9 Jun 2021 15:13:43 +0200
Subject: [PATCH] Use gettext_lazy for all models, forms and tables.

---
 hypha/apply/api/v1/filters.py                  | 2 +-
 hypha/apply/determinations/forms.py            | 4 ++--
 hypha/apply/funds/admin_views.py               | 2 +-
 hypha/apply/funds/models/reviewer_role.py      | 2 +-
 hypha/apply/funds/models/screening.py          | 2 +-
 hypha/apply/funds/models/utils.py              | 2 +-
 hypha/apply/projects/filters.py                | 2 +-
 hypha/apply/review/templatetags/review_tags.py | 3 +--
 hypha/apply/utils/models.py                    | 2 +-
 hypha/public/forms/models.py                   | 1 -
 hypha/public/funds/models.py                   | 3 +--
 hypha/public/home/blocks.py                    | 2 +-
 hypha/public/home/models.py                    | 2 +-
 hypha/public/mailchimp/forms.py                | 2 +-
 hypha/public/mailchimp/models.py               | 2 +-
 hypha/public/navigation/models.py              | 2 +-
 hypha/public/news/blocks.py                    | 2 +-
 hypha/public/news/models.py                    | 5 ++---
 hypha/public/partner/models.py                 | 2 +-
 hypha/public/partner/tables.py                 | 1 -
 hypha/public/people/models.py                  | 2 +-
 hypha/public/projects/models.py                | 2 +-
 hypha/public/standardpages/models.py           | 2 +-
 hypha/public/utils/models.py                   | 2 +-
 24 files changed, 24 insertions(+), 29 deletions(-)

diff --git a/hypha/apply/api/v1/filters.py b/hypha/apply/api/v1/filters.py
index 346418452..d8a14a94f 100644
--- a/hypha/apply/api/v1/filters.py
+++ b/hypha/apply/api/v1/filters.py
@@ -1,5 +1,5 @@
 from django.db.models import Q
-from django.utils.translation import gettext as _
+from django.utils.translation import gettext_lazy as _
 from django_filters import rest_framework as filters
 from wagtail.core.models import Page
 
diff --git a/hypha/apply/determinations/forms.py b/hypha/apply/determinations/forms.py
index 3cb98e00b..54b297e06 100644
--- a/hypha/apply/determinations/forms.py
+++ b/hypha/apply/determinations/forms.py
@@ -1,7 +1,7 @@
 from django import forms
 from django.contrib.auth import get_user_model
 from django.core.exceptions import NON_FIELD_ERRORS
-from django.utils.translation import gettext as _
+from django.utils.translation import gettext_lazy as _
 
 from hypha.apply.funds.models import ApplicationSubmission
 from hypha.apply.stream_forms.forms import StreamBaseForm
@@ -293,7 +293,7 @@ class BaseProposalDeterminationForm(forms.Form):
     technical = RichTextField(label=_('Technical feasibility questions and comments'))
     technical.group = 3
 
-    alternative = RichTextField(label=_('Alternative analysis - ')red teaming" questions and comments')
+    alternative = RichTextField(label=_('Alternative analysis - "red teaming" questions and comments'))
     alternative.group = 3
 
     usability = RichTextField(label=_('Usability questions and comments'))
diff --git a/hypha/apply/funds/admin_views.py b/hypha/apply/funds/admin_views.py
index c1f7f0bb9..29c3c4cc3 100644
--- a/hypha/apply/funds/admin_views.py
+++ b/hypha/apply/funds/admin_views.py
@@ -1,7 +1,7 @@
 from django.contrib.admin.utils import unquote
 from django.core.exceptions import PermissionDenied
 from django.shortcuts import get_object_or_404, redirect
-from django.utils.translation import gettext_lazy as _
+from django.utils.translation import gettext as _
 from wagtail.admin import messages
 from wagtail.admin.forms.pages import CopyForm
 from wagtail.admin.views.pages.utils import get_valid_next_url_from_request
diff --git a/hypha/apply/funds/models/reviewer_role.py b/hypha/apply/funds/models/reviewer_role.py
index 00a39a9bd..4226124cf 100644
--- a/hypha/apply/funds/models/reviewer_role.py
+++ b/hypha/apply/funds/models/reviewer_role.py
@@ -1,5 +1,5 @@
 from django.db import models
-from django.utils.translation import gettext as _
+from django.utils.translation import gettext_lazy as _
 from wagtail.admin.edit_handlers import FieldPanel
 from wagtail.contrib.settings.models import BaseSetting, register_setting
 from wagtail.images.edit_handlers import ImageChooserPanel
diff --git a/hypha/apply/funds/models/screening.py b/hypha/apply/funds/models/screening.py
index 941a8d817..c51dba24e 100644
--- a/hypha/apply/funds/models/screening.py
+++ b/hypha/apply/funds/models/screening.py
@@ -1,5 +1,5 @@
 from django.db import models
-from django.utils.translation import gettext as _
+from django.utils.translation import gettext_lazy as _
 
 from ..admin_forms import ScreeningStatusAdminForm
 
diff --git a/hypha/apply/funds/models/utils.py b/hypha/apply/funds/models/utils.py
index ca8221c02..45438dbcd 100644
--- a/hypha/apply/funds/models/utils.py
+++ b/hypha/apply/funds/models/utils.py
@@ -1,6 +1,6 @@
 from django.db import models
 from django.urls import reverse
-from django.utils.translation import gettext as _
+from django.utils.translation import gettext_lazy as _
 from wagtail.admin.edit_handlers import (
     FieldPanel,
     FieldRowPanel,
diff --git a/hypha/apply/projects/filters.py b/hypha/apply/projects/filters.py
index 9c448160f..83525d361 100644
--- a/hypha/apply/projects/filters.py
+++ b/hypha/apply/projects/filters.py
@@ -2,7 +2,7 @@ import django_filters as filters
 from django import forms
 from django.contrib.auth import get_user_model
 from django.db.models import Q
-from django.utils.translation import gettext as _
+from django.utils.translation import gettext_lazy as _
 from django_select2.forms import Select2Widget
 
 from hypha.apply.funds.tables import (
diff --git a/hypha/apply/review/templatetags/review_tags.py b/hypha/apply/review/templatetags/review_tags.py
index c965fe1b9..e9c7e297a 100644
--- a/hypha/apply/review/templatetags/review_tags.py
+++ b/hypha/apply/review/templatetags/review_tags.py
@@ -1,6 +1,5 @@
 from django import template
 from django.utils.safestring import mark_safe
-from django.utils.translation import gettext as _
 
 from ..models import MAYBE, NO, YES
 
@@ -22,7 +21,7 @@ TRAFFIC_LIGHT_COLORS = {
     }
 }
 
-TRAFFIC_LIGHT_TEMPLATE = '<span aria-label=_('Traffic light score') class="traffic-light traffic-light--{color}">{value}</span>'
+TRAFFIC_LIGHT_TEMPLATE = '<span class="traffic-light traffic-light__{color}"></span>'
 
 
 @register.filter()
diff --git a/hypha/apply/utils/models.py b/hypha/apply/utils/models.py
index 0aa4ed558..9af6ae81d 100644
--- a/hypha/apply/utils/models.py
+++ b/hypha/apply/utils/models.py
@@ -1,5 +1,5 @@
 from django.db import models
-from django.utils.translation import gettext as _
+from django.utils.translation import gettext_lazy as _
 from wagtail.admin.edit_handlers import FieldPanel
 from wagtail.contrib.settings.models import BaseSetting, register_setting
 
diff --git a/hypha/public/forms/models.py b/hypha/public/forms/models.py
index 24414bbe6..38e2c66c4 100644
--- a/hypha/public/forms/models.py
+++ b/hypha/public/forms/models.py
@@ -9,7 +9,6 @@ from django.forms import FileField
 from django.utils.decorators import method_decorator
 from django.utils.translation import gettext_lazy as _
 from django.views.decorators.cache import never_cache
-from django.utils.translation import gettext as _
 from modelcluster.fields import ParentalKey
 from wagtail.admin.edit_handlers import (
     FieldPanel,
diff --git a/hypha/public/funds/models.py b/hypha/public/funds/models.py
index 591ab0dd3..898077358 100644
--- a/hypha/public/funds/models.py
+++ b/hypha/public/funds/models.py
@@ -4,8 +4,7 @@ from django.core.exceptions import ValidationError
 from django.core.paginator import EmptyPage, PageNotAnInteger, Paginator
 from django.db import models
 from django.utils.deconstruct import deconstructible
-from django.utils.translation import gettext as _
-from django.utils.translation import gettext as _
+from django.utils.translation import gettext_lazy as _
 from modelcluster.fields import ParentalKey
 from pagedown.widgets import PagedownWidget
 from wagtail.admin.edit_handlers import (
diff --git a/hypha/public/home/blocks.py b/hypha/public/home/blocks.py
index eb368259a..307366686 100644
--- a/hypha/public/home/blocks.py
+++ b/hypha/public/home/blocks.py
@@ -1,4 +1,4 @@
-from django.utils.translation import gettext as _
+from django.utils.translation import gettext_lazy as _
 from wagtail.core import blocks
 from wagtail.images.blocks import ImageChooserBlock
 
diff --git a/hypha/public/home/models.py b/hypha/public/home/models.py
index 8db729ac5..f86a8c9f1 100644
--- a/hypha/public/home/models.py
+++ b/hypha/public/home/models.py
@@ -1,7 +1,7 @@
 import datetime
 
 from django.db import models
-from django.utils.translation import gettext as _
+from django.utils.translation import gettext_lazy as _
 from modelcluster.fields import ParentalKey
 from wagtail.admin.edit_handlers import (
     FieldPanel,
diff --git a/hypha/public/mailchimp/forms.py b/hypha/public/mailchimp/forms.py
index 15e6284fd..5bfde3f36 100644
--- a/hypha/public/mailchimp/forms.py
+++ b/hypha/public/mailchimp/forms.py
@@ -1,5 +1,5 @@
 from django import forms
-from django.utils.translation import gettext as _
+from django.utils.translation import gettext_lazy as _
 
 
 class NewsletterForm(forms.Form):
diff --git a/hypha/public/mailchimp/models.py b/hypha/public/mailchimp/models.py
index 9aeb7c4ef..629195ce4 100644
--- a/hypha/public/mailchimp/models.py
+++ b/hypha/public/mailchimp/models.py
@@ -1,5 +1,5 @@
 from django.db import models
-from django.utils.translation import gettext as _
+from django.utils.translation import gettext_lazy as _
 from wagtail.admin.edit_handlers import FieldPanel
 from wagtail.contrib.settings.models import BaseSetting, register_setting
 
diff --git a/hypha/public/navigation/models.py b/hypha/public/navigation/models.py
index e02d055b3..7b82d5859 100644
--- a/hypha/public/navigation/models.py
+++ b/hypha/public/navigation/models.py
@@ -1,4 +1,4 @@
-from django.utils.translation import gettext as _
+from django.utils.translation import gettext_lazy as _
 from modelcluster.models import ClusterableModel
 from wagtail.admin.edit_handlers import StreamFieldPanel
 from wagtail.contrib.settings.models import BaseSetting, register_setting
diff --git a/hypha/public/news/blocks.py b/hypha/public/news/blocks.py
index 721685a1d..72721f8e4 100644
--- a/hypha/public/news/blocks.py
+++ b/hypha/public/news/blocks.py
@@ -1,5 +1,5 @@
+from django.utils.translation import gettext_lazy as _
 from wagtail.core import blocks
-from django.utils.translation import gettext as _
 
 from hypha.public.utils.blocks import StoryBlock
 
diff --git a/hypha/public/news/models.py b/hypha/public/news/models.py
index 77d05ef8c..6d3eca87b 100644
--- a/hypha/public/news/models.py
+++ b/hypha/public/news/models.py
@@ -2,7 +2,7 @@ from django.conf import settings
 from django.core.paginator import EmptyPage, PageNotAnInteger, Paginator
 from django.db import models
 from django.db.models.functions import Coalesce
-from django.utils.translation import gettext as _
+from django.utils.translation import gettext_lazy as _
 from modelcluster.fields import ParentalKey
 from pagedown.widgets import PagedownWidget
 from wagtail.admin.edit_handlers import (
@@ -95,8 +95,7 @@ class NewsPage(BasePage):
     # It's datetime for easy comparison with first_published_at
     publication_date = models.DateTimeField(
         null=True, blank=True,
-        help_text=_('Use this field to override the date that the ')
-        "news item appears to have been published."
+        help_text=_('Use this field to override the date that the news item appears to have been published.')
     )
     introduction = models.TextField(blank=True)
     body = StreamField(NewsStoryBlock(block_counts={'awesome_table_widget': {'max_num': 1}}))
diff --git a/hypha/public/partner/models.py b/hypha/public/partner/models.py
index 72ea9dd7b..7e34638b4 100644
--- a/hypha/public/partner/models.py
+++ b/hypha/public/partner/models.py
@@ -5,7 +5,7 @@ from django.core.validators import MaxValueValidator, MinValueValidator
 from django.db import models
 from django.http import Http404
 from django.shortcuts import redirect
-from django.utils.translation import gettext as _
+from django.utils.translation import gettext_lazy as _
 from pagedown.widgets import PagedownWidget
 from wagtail.admin.edit_handlers import FieldPanel
 from wagtail.admin.forms import WagtailAdminModelForm
diff --git a/hypha/public/partner/tables.py b/hypha/public/partner/tables.py
index 0c99cbb0c..866b15a14 100644
--- a/hypha/public/partner/tables.py
+++ b/hypha/public/partner/tables.py
@@ -3,7 +3,6 @@ import django_tables2 as tables
 from django import forms
 from django.db.models import Q
 from django.utils.translation import gettext_lazy as _
-from django.utils.translation import gettext as _
 
 from hypha.apply.funds.tables import Select2MultipleChoiceFilter
 
diff --git a/hypha/public/people/models.py b/hypha/public/people/models.py
index f267134f1..73a974855 100644
--- a/hypha/public/people/models.py
+++ b/hypha/public/people/models.py
@@ -2,7 +2,7 @@ from django.conf import settings
 from django.core.exceptions import ValidationError
 from django.core.paginator import EmptyPage, PageNotAnInteger, Paginator
 from django.db import models
-from django.utils.translation import gettext as _
+from django.utils.translation import gettext_lazy as _
 from modelcluster.fields import ParentalKey
 from pagedown.widgets import PagedownWidget
 from wagtail.admin.edit_handlers import (
diff --git a/hypha/public/projects/models.py b/hypha/public/projects/models.py
index 00d2a58d8..96180d29d 100644
--- a/hypha/public/projects/models.py
+++ b/hypha/public/projects/models.py
@@ -5,7 +5,7 @@ from django.core.exceptions import ValidationError
 from django.core.paginator import EmptyPage, PageNotAnInteger, Paginator
 from django.core.validators import URLValidator
 from django.db import models
-from django.utils.translation import gettext as _
+from django.utils.translation import gettext_lazy as _
 from modelcluster.fields import ParentalKey
 from pagedown.widgets import PagedownWidget
 from wagtail.admin.edit_handlers import (
diff --git a/hypha/public/standardpages/models.py b/hypha/public/standardpages/models.py
index d72ec93f5..b37ce19d1 100644
--- a/hypha/public/standardpages/models.py
+++ b/hypha/public/standardpages/models.py
@@ -1,7 +1,7 @@
 from django.conf import settings
 from django.core.paginator import EmptyPage, PageNotAnInteger, Paginator
 from django.db import models
-from django.utils.translation import gettext as _
+from django.utils.translation import gettext_lazy as _
 from modelcluster.fields import ParentalKey
 from pagedown.widgets import PagedownWidget
 from wagtail.admin.edit_handlers import FieldPanel, InlinePanel, StreamFieldPanel
diff --git a/hypha/public/utils/models.py b/hypha/public/utils/models.py
index 0b8bd3dea..2c50a89ac 100644
--- a/hypha/public/utils/models.py
+++ b/hypha/public/utils/models.py
@@ -2,7 +2,7 @@ from django.conf import settings
 from django.core.exceptions import ValidationError
 from django.db import models
 from django.utils.decorators import method_decorator
-from django.utils.translation import gettext as _
+from django.utils.translation import gettext_lazy as _
 from wagtail.admin.edit_handlers import (
     FieldPanel,
     FieldRowPanel,
-- 
GitLab