diff --git a/hypha/apply/funds/forms.py b/hypha/apply/funds/forms.py
index 9daddc1ee29f6d6565b89b35b58281a6fb13bf1e..8dc858ae06164fe55660053d96ab8842fbd2cc2f 100644
--- a/hypha/apply/funds/forms.py
+++ b/hypha/apply/funds/forms.py
@@ -2,6 +2,7 @@ from functools import partial
from itertools import groupby
from operator import methodcaller
+import bleach
from django import forms
from django.utils.safestring import mark_safe
from django.utils.text import slugify
@@ -349,14 +350,15 @@ def make_role_reviewer_fields():
staff_reviewers = User.objects.staff().only('full_name', 'pk')
for role in ReviewerRole.objects.all().order_by('order'):
- field_name = 'role_reviewer_' + slugify(str(role))
+ role_name = bleach.clean(role.name, strip=True)
+ field_name = 'role_reviewer_' + slugify(role_name)
field = forms.ModelChoiceField(
queryset=staff_reviewers,
widget=Select2Widget(attrs={
- 'data-placeholder': 'Select a reviewer',
+ 'data-placeholder': _('Select a reviewer'),
}),
required=False,
- label=mark_safe(render_icon(role.icon) + f'{role.name} Reviewer'),
+ label=mark_safe(render_icon(role.icon) + _('{role_name} Reviewer').format(role_name=role_name)),
)
role_fields.append({
'role': role,
diff --git a/hypha/apply/projects/admin.py b/hypha/apply/projects/admin.py
index 81e47b3a79fa61d4151af6f84e33dc73643a15bd..a5f69ceb13a96bdd8bfc04b091ed4349be8d10d3 100644
--- a/hypha/apply/projects/admin.py
+++ b/hypha/apply/projects/admin.py
@@ -1,4 +1,3 @@
-from django.utils.safestring import mark_safe
from wagtail.contrib.modeladmin.options import ModelAdmin, ModelAdminGroup
from .models import DocumentCategory, ProjectApprovalForm
@@ -21,7 +20,7 @@ class ProjectApprovalFormAdmin(ModelAdmin):
related = ', '.join(getattr(obj, f'{field}').values_list('title', flat=True))
if related:
rows.append(related)
- return mark_safe('<br>'.join(rows))
+ return ', '.join(rows)
class ManageAdminGoup(ModelAdminGroup):
diff --git a/hypha/apply/utils/admin.py b/hypha/apply/utils/admin.py
index 4b119ee63a3071c80da9286c465213b58c7e7943..e59c2e6d008291f932aa17946d38996881d5e3c0 100644
--- a/hypha/apply/utils/admin.py
+++ b/hypha/apply/utils/admin.py
@@ -1,6 +1,3 @@
-from django.utils.safestring import mark_safe
-
-
class ListRelatedMixin:
"""Provides a used_by column which can be found by defining related models in the
following format:
@@ -11,6 +8,7 @@ class ListRelatedMixin:
e.g. This would be object.<related_name>_set.field
"""
+
def get_queryset(self, request):
qs = super().get_queryset(request)
related = [f'{form}_set__{field}' for form, field in self.related_models]
@@ -25,4 +23,4 @@ class ListRelatedMixin:
related = self._list_related(obj, form, field)
if related:
rows.append(related)
- return mark_safe('<br>'.join(rows))
+ return ', '.join(rows)
diff --git a/hypha/locale/django.pot b/hypha/locale/django.pot
index 605f5f273fbcd84b752e52e370a8ce0e821bbda5..91000b2ac4a2e0a4b650861550bc694283037561 100644
--- a/hypha/locale/django.pot
+++ b/hypha/locale/django.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-08-25 16:26+0000\n"
+"POT-Creation-Date: 2021-08-26 07:10+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -1076,34 +1076,43 @@ msgstr ""
msgid "Custom"
msgstr ""
-#: hypha/apply/funds/forms.py:59 hypha/apply/funds/forms.py:78
+#: hypha/apply/funds/forms.py:60 hypha/apply/funds/forms.py:79
msgid "Take action"
msgstr ""
-#: hypha/apply/funds/forms.py:143 hypha/apply/projects/filters.py:28
+#: hypha/apply/funds/forms.py:144 hypha/apply/projects/filters.py:28
#: hypha/apply/projects/filters.py:38 hypha/apply/projects/filters.py:52
#: hypha/apply/projects/tables.py:49 hypha/apply/projects/tables.py:90
msgid "Lead"
msgstr ""
-#: hypha/apply/funds/forms.py:195 hypha/apply/funds/tables.py:259
+#: hypha/apply/funds/forms.py:196 hypha/apply/funds/tables.py:259
#: hypha/apply/funds/tables.py:443
msgid "Reviewers"
msgstr ""
-#: hypha/apply/funds/forms.py:259 hypha/apply/funds/forms.py:330
+#: hypha/apply/funds/forms.py:260 hypha/apply/funds/forms.py:331
msgid "Users cannot be assigned to multiple roles."
msgstr ""
-#: hypha/apply/funds/forms.py:374
+#: hypha/apply/funds/forms.py:358
+msgid "Select a reviewer"
+msgstr ""
+
+#: hypha/apply/funds/forms.py:361
+#, python-brace-format
+msgid "{role_name} Reviewer"
+msgstr ""
+
+#: hypha/apply/funds/forms.py:376
msgid "Partners"
msgstr ""
-#: hypha/apply/funds/forms.py:435
+#: hypha/apply/funds/forms.py:437
msgid "Meta terms"
msgstr ""
-#: hypha/apply/funds/forms.py:438
+#: hypha/apply/funds/forms.py:440
msgid "Meta terms are hierarchical in nature."
msgstr ""
diff --git a/hypha/locale/en/LC_MESSAGES/django.po b/hypha/locale/en/LC_MESSAGES/django.po
index eef3eda81133bdad08d0d8767d6183278b793255..3e03a846c5eca706ac1c715f1085f806c76f3fd0 100644
--- a/hypha/locale/en/LC_MESSAGES/django.po
+++ b/hypha/locale/en/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-08-25 16:26+0000\n"
+"POT-Creation-Date: 2021-08-26 07:10+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -1076,34 +1076,43 @@ msgstr ""
msgid "Custom"
msgstr ""
-#: hypha/apply/funds/forms.py:59 hypha/apply/funds/forms.py:78
+#: hypha/apply/funds/forms.py:60 hypha/apply/funds/forms.py:79
msgid "Take action"
msgstr ""
-#: hypha/apply/funds/forms.py:143 hypha/apply/projects/filters.py:28
+#: hypha/apply/funds/forms.py:144 hypha/apply/projects/filters.py:28
#: hypha/apply/projects/filters.py:38 hypha/apply/projects/filters.py:52
#: hypha/apply/projects/tables.py:49 hypha/apply/projects/tables.py:90
msgid "Lead"
msgstr ""
-#: hypha/apply/funds/forms.py:195 hypha/apply/funds/tables.py:259
+#: hypha/apply/funds/forms.py:196 hypha/apply/funds/tables.py:259
#: hypha/apply/funds/tables.py:443
msgid "Reviewers"
msgstr ""
-#: hypha/apply/funds/forms.py:259 hypha/apply/funds/forms.py:330
+#: hypha/apply/funds/forms.py:260 hypha/apply/funds/forms.py:331
msgid "Users cannot be assigned to multiple roles."
msgstr ""
-#: hypha/apply/funds/forms.py:374
+#: hypha/apply/funds/forms.py:358
+msgid "Select a reviewer"
+msgstr ""
+
+#: hypha/apply/funds/forms.py:361
+#, python-brace-format
+msgid "{role_name} Reviewer"
+msgstr ""
+
+#: hypha/apply/funds/forms.py:376
msgid "Partners"
msgstr ""
-#: hypha/apply/funds/forms.py:435
+#: hypha/apply/funds/forms.py:437
msgid "Meta terms"
msgstr ""
-#: hypha/apply/funds/forms.py:438
+#: hypha/apply/funds/forms.py:440
msgid "Meta terms are hierarchical in nature."
msgstr ""