Merge changes from main

Author: BenMillar-MOJ

app/categories/constants.py

@@ -380,7 +380,7 @@ def __str__(self):
 PUBLIC_LAW = Category(
     title=_("Legal action against police and public organisations"),
     description=_(
-        "Includes schools, the police, government, prisons, NHS, the council."
+        "Includes police, government, prisons, NHS, the council, care facilities and schools."
     ),
     article_category_name="Public",
     chs_code="publiclaw",

app/categories/discrimination/forms.py

@@ -5,14 +5,15 @@
 from wtforms.validators import InputRequired
 from app.categories.x_cat.forms import AreYouUnder18Form
 from app.categories.constants import DISCRIMINATION
+from flask_babel import lazy_gettext as _
 
 
 class DiscriminationQuestionForm(QuestionForm):
     category = DISCRIMINATION
 
 
 class DiscriminationWhereForm(DiscriminationQuestionForm):
-    title = "Where did the discrimination happen?"
+    title = _("Where did the discrimination happen?")
 
     next_step_mapping = {
         "*": "categories.discrimination.why",
@@ -22,31 +23,37 @@ class DiscriminationWhereForm(DiscriminationQuestionForm):
     question = SelectMultipleField(
         title,
         widget=CategoryCheckboxInput(
-            show_divider=True, hint_text="You can select more than one."
+            show_divider=True, hint_text=_("You can select more than one.")
         ),
-        validators=[InputRequired(message="Select where the discrimination happened")],
+        validators=[
+            InputRequired(message=_("Select where the discrimination happened"))
+        ],
         choices=[
-            ("work", "Work - including colleagues, employer or employment agency"),
-            ("school", "School, college, university or other education setting"),
+            ("work", _("Work - including colleagues, employer or employment agency")),
+            ("school", _("School, college, university or other education setting")),
             (
                 "business",
-                "Businesses or services - such as a shop, restaurant, train, hotel, bank, law firm",
+                _(
+                    "Businesses or services - such as a shop, restaurant, train, hotel, bank, law firm"
+                ),
             ),
-            ("healthcare", "Health or care - such as a hospital or care home"),
-            ("housing", "Housing - such as a landlord or estate agent"),
+            ("healthcare", _("Health or care - such as a hospital or care home")),
+            ("housing", _("Housing - such as a landlord or estate agent")),
             (
                 "public",
-                "Public services and authorities - such as the police, social services, council or local authority, jobcentre, government",
+                _(
+                    "Public services and authorities - such as the police, social services, council or local authority, jobcentre, government"
+                ),
             ),
-            ("club", "Clubs and associations - such as a sports club"),
+            ("club", _("Clubs and associations - such as a sports club")),
             ("", ""),
-            ("notsure", "I’m not sure"),
+            ("notsure", _("I’m not sure")),
         ],
     )
 
 
 class DiscriminationWhyForm(DiscriminationQuestionForm):
-    title = "Why were you discriminated against?"
+    title = _("Why were you discriminated against?")
 
     next_step_mapping = {
         "*": "categories.discrimination.age",
@@ -57,37 +64,39 @@ class DiscriminationWhyForm(DiscriminationQuestionForm):
         title,
         widget=CategoryCheckboxInput(
             show_divider=True,
-            hint_text="You can select more than one.",
+            hint_text=_("You can select more than one."),
             behaviour="exclusive",
         ),
         validators=[
-            InputRequired(message="Select why you were discriminated against"),
+            InputRequired(message=_("Select why you were discriminated against")),
             ExclusiveValue(
                 exclusive_value="none",
-                message="Select why you were discriminated against, or select ‘None of these’",
+                message=_(
+                    "Select why you were discriminated against, or select ‘None of these’"
+                ),
             ),
         ],
         choices=[
-            ("race", "Race, colour, ethnicity, nationality"),
-            ("sex", "Sex (male or female)"),
-            ("disability", "Disability, health condition, mental health condition"),
-            ("religion", "Religion, belief, lack of religion"),
-            ("age", "Age"),
-            ("pregnancy", "Pregnancy or being a mother"),
+            ("race", _("Race, colour, ethnicity, nationality")),
+            ("sex", _("Sex (male or female)")),
+            ("disability", _("Disability, health condition, mental health condition")),
+            ("religion", _("Religion, belief, lack of religion")),
+            ("age", _("Age")),
+            ("pregnancy", _("Pregnancy or being a mother")),
             (
                 "sexualorientation",
-                "Sexual orientation - gay, bisexual, other sexuality",
+                _("Sexual orientation - gay, bisexual, other sexuality"),
             ),
             (
                 "gender",
-                "Gender reassignment, being transgender, non-binary or gender-fluid",
+                _("Gender reassignment, being transgender, non-binary or gender-fluid"),
             ),
             (
                 "marriage",
-                "Married status - being married, in a civil partnership",
+                _("Married status - being married, in a civil partnership"),
             ),
             ("", ""),
-            ("none", "None of these"),
+            ("none", _("None of these")),
         ],
     )
 

app/categories/widgets.py

@@ -1,4 +1,5 @@
 from govuk_frontend_wtf.wtforms_widgets import GovRadioInput, GovCheckboxesInput
+from flask_babel import lazy_gettext as _
 
 
 class CategoryInputField:
@@ -38,7 +39,7 @@ def map_gov_params(self, field, **kwargs):
 
         # Add divider if enabled and there are enough items
         if self.show_divider and len(items) >= 2:
-            items[-2]["divider"] = "or"
+            items[-2]["divider"] = _("or")
 
         # Handle pre-selected answer if present
         if field.data:

app/means_test/forms/benefits.py

@@ -201,6 +201,7 @@ class AdditionalBenefitsForm(BaseMeansTestForm):
     )
     total_other_benefit = MoneyIntervalField(
         label=_("If Yes, total amount of benefits not listed above"),
+        hint_text=_("For example, £32.18 per week"),
         exclude_intervals=["per_month"],
         widget=MoneyIntervalWidget(),
         validators=[

app/templates/categories/components/cannot-find-your-problem.html

@@ -5,6 +5,6 @@
             {% if category %}: {{ category }}
             {% endif %}
         </p>
-        <a class="govuk-link govuk-link--no-visited-state" href="{{ url }}">Next steps to get help</a>
+        <a class="govuk-link govuk-link--no-visited-state" href="{{ url }}">{% trans %}Next steps to get help{% endtrans %}</a>
     </div>
 {% endmacro %}

app/templates/categories/index.html

@@ -11,9 +11,9 @@
 
 <div class="govuk-grid-row">
     <div class="govuk-grid-column-two-thirds">
-        <h1 class="govuk-heading-xl govuk-!-margin-bottom-6">Find problems covered by legal aid</h1>
+        <h1 class="govuk-heading-xl govuk-!-margin-bottom-6">{{ title }}</h1>
 
-        <p class="govuk-body-l">These are the problems covered by legal aid. Choose the problem you need help with.</p>
+        <p class="govuk-body-l">{% trans %}These are the problems covered by legal aid. Choose the problem you need help with.{% endtrans %}</p>
 
         <div class="govuk-!-margin-top-8">
             {% for category, next_page in listing %}

app/templates/means_test/additional-benefits.html

@@ -1,5 +1,11 @@
 {% extends "means_test/form-page.html" %}
 
+{% block formDescription %}
+    <p class="govuk-body-l">
+    {% trans %}You’ll need to provide evidence of the financial information you’ve given us through this service.{% endtrans %}
+    </p>
+{% endblock %}
+
 {% block form %}
 
     {{ form.csrf_token }}