format_html, mark_safe, translations

clinicedc · Jan 22, 2025 · c4f4fef · c4f4fef
1 parent bfbe657
commit c4f4fef
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 11 deletions.
diff --git a/...review/model_mixins/clinical_review_followup/clinical_review_followup_chol_model_mixin.py b/...review/model_mixins/clinical_review_followup/clinical_review_followup_chol_model_mixin.py
@@ -42,7 +42,8 @@ class ClinicalReviewCholModelMixin(models.Model):
 
     chol_dx = models.CharField(
         verbose_name=format_html(
-            "As of today, was the patient <u>{}</u> diagnosed with high cholesterol?", "newly"
+            "As of today, was the patient <u>{text}</u> diagnosed with high cholesterol?",
+            text="newly",
         ),
         max_length=15,
         choices=YES_NO_NA,

diff --git a/...x_review/model_mixins/clinical_review_followup/clinical_review_followup_dm_model_mixin.py b/...x_review/model_mixins/clinical_review_followup/clinical_review_followup_dm_model_mixin.py
@@ -15,8 +15,8 @@ class ClinicalReviewDmModelMixin(models.Model):
         choices=YES_NO_NA,
         default=NOT_APPLICABLE,
         help_text=format_html(
-            "{}",
-            mark_safe(
+            "{html}",
+            html=mark_safe(
                 "Note: Select `not applicable` if diagnosis previously reported. <BR>"
                 "`Since last seen` includes today.<BR>"
                 "If `yes', complete the initial review CRF<BR>"
@@ -42,7 +42,8 @@ class ClinicalReviewDmModelMixin(models.Model):
 
     dm_dx = models.CharField(
         verbose_name=format_html(
-            "As of today, was the patient <u>{}</u> diagnosed with diabetes?", "newly"
+            "As of today, was the patient <u>{text}</u> diagnosed with diabetes?",
+            text="newly",
         ),
         max_length=15,
         choices=YES_NO_NA,

diff --git a/..._review/model_mixins/clinical_review_followup/clinical_review_followup_hiv_model_mixin.py b/..._review/model_mixins/clinical_review_followup/clinical_review_followup_hiv_model_mixin.py
@@ -15,8 +15,8 @@ class ClinicalReviewHivModelMixin(models.Model):
         choices=YES_NO_NA,
         default=NOT_APPLICABLE,
         help_text=format_html(
-            "{}",
-            mark_safe(
+            "{html}",
+            html=mark_safe(
                 "Note: Select `not applicable` if diagnosis previously reported. <BR>"
                 "`Since last seen` includes today.<BR>"
                 "If `yes', complete the initial review CRF<BR>"
@@ -42,7 +42,8 @@ class ClinicalReviewHivModelMixin(models.Model):
 
     hiv_dx = models.CharField(
         verbose_name=format_html(
-            "As of today, was the patient <u>{}</u> diagnosed with HIV infection?", "newly"
+            "As of today, was the patient <u>{text}</u> diagnosed with HIV infection?",
+            text="newly",
         ),
         max_length=15,
         choices=YES_NO_NA,

diff --git a/..._review/model_mixins/clinical_review_followup/clinical_review_followup_htn_model_mixin.py b/..._review/model_mixins/clinical_review_followup/clinical_review_followup_htn_model_mixin.py
@@ -15,8 +15,8 @@ class ClinicalReviewHtnModelMixin(models.Model):
         choices=YES_NO_NA,
         default=NOT_APPLICABLE,
         help_text=format_html(
-            "{}",
-            mark_safe(
+            "{html}",
+            html=mark_safe(
                 "Note: Select `not applicable` if diagnosis previously reported. <BR>"
                 "`Since last seen` includes today.<BR>"
                 "If `yes', complete the initial review CRF<BR>"
@@ -42,8 +42,8 @@ class ClinicalReviewHtnModelMixin(models.Model):
 
     htn_dx = models.CharField(
         verbose_name=format_html(
-            "{}",
-            mark_safe(
+            "{html}",
+            html=mark_safe(
                 "As of today, was the patient <u>newly</u> diagnosed with hypertension?"
             ),  # nosec B308, B703
         ),