From b1320fdc17af48cae464ff91eb8f8bcb856d52e7 Mon Sep 17 00:00:00 2001
From: Matt Shaw <matthew.shaw@landregistry.gov.uk>
Date: Wed, 1 Nov 2023 16:19:02 +0000
Subject: [PATCH] accordion changes

---
 .../templates/components/accordion/macro.html | 38 ++++++++++++++++---
 1 file changed, 32 insertions(+), 6 deletions(-)

diff --git a/govuk_frontend_jinja/templates/components/accordion/macro.html b/govuk_frontend_jinja/templates/components/accordion/macro.html
index bcb84f64..6e5288dd 100644
--- a/govuk_frontend_jinja/templates/components/accordion/macro.html
+++ b/govuk_frontend_jinja/templates/components/accordion/macro.html
@@ -1,15 +1,41 @@
 {% macro govukAccordion(params) %}
+{% from "govuk_frontend_jinja/macros/i18n.html" import govukI18nAttributes %}
+
 {% set id = params.id %}
 {% set headingLevel = params.headingLevel if params.headingLevel else 2 %}
 
 <div class="govuk-accordion {%- if params.classes %} {{ params.classes }}{% endif -%}" data-module="govuk-accordion" id="{{ id }}"
-  {%- if params.hideAllSectionsText %} data-i18n.hide-all-sections="{{ params.hideAllSectionsText | escape }}"{% endif %}
-  {%- if params.hideSectionText %} data-i18n.hide-section="{{ params.hideSectionText | escape }}"{% endif %}
-  {%- if params.hideSectionAriaLabelText %} data-i18n.hide-section-aria-label="{{ params.hideSectionAriaLabelText | escape }}"{% endif %}
+  {{- govukI18nAttributes({
+    'key': 'hide-all-sections',
+    'message': params.hideAllSectionsText
+  }) -}}
+
+  {{- govukI18nAttributes({
+    'key': 'hide-section',
+    'message': params.hideSectionText
+  }) -}}
+
+  {{- govukI18nAttributes({
+    'key': 'hide-section-aria-label',
+    'message': params.hideSectionAriaLabelText
+  }) -}}
+
+  {{- govukI18nAttributes({
+    'key': 'show-all-sections',
+    'message': params.showAllSectionsText
+  }) -}}
+
+  {{- govukI18nAttributes({
+    'key': 'show-section',
+    'message': params.showSectionText
+  }) -}}
+
+  {{- govukI18nAttributes({
+    'key': 'show-section-aria-label',
+    'message': params.showSectionAriaLabelText
+  }) -}}
+
   {%- if params.rememberExpanded is not undefined %} data-remember-expanded="{{ params.rememberExpanded | escape | lower }}"{% endif %}
-  {%- if params.showAllSectionsText %} data-i18n.show-all-sections="{{ params.showAllSectionsText | escape }}"{% endif %}
-  {%- if params.showSectionText %} data-i18n.show-section="{{ params.showSectionText | escape }}"{% endif %}
-  {%- if params.showSectionAriaLabelText %} data-i18n.show-section-aria-label="{{ params.showSectionAriaLabelText | escape }}"{% endif %}
   {%- for attribute, value in (params.attributes.items() if params.attributes else {}.items()) %} {{attribute}}="{{value}}"{% endfor %}>
   {% for item in params['items'] %}
     {% if item %}