From e4d0ebde4408cc98286164b1f59d3761dcf51f55 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Risto=20Nyk=C3=A4nen?= Date: Wed, 12 Mar 2025 14:21:36 +0200 Subject: [PATCH 1/3] remove the old provided-language template and use the entity method instead --- ...ld--tpr-unit--provided-languages.html.twig | 19 ------------------- .../tpr-unit-contact-information.html.twig | 4 ++-- 2 files changed, 2 insertions(+), 21 deletions(-) delete mode 100644 templates/field/field--tpr-unit--provided-languages.html.twig diff --git a/templates/field/field--tpr-unit--provided-languages.html.twig b/templates/field/field--tpr-unit--provided-languages.html.twig deleted file mode 100644 index d60ff8502..000000000 --- a/templates/field/field--tpr-unit--provided-languages.html.twig +++ /dev/null @@ -1,19 +0,0 @@ -{% - set languages = { - 'fi': 'Finnish', - 'sv': 'Swedish', - 'en': 'English' - } -%} - -{%- for item in items -%} - {% set provided_language = languages[item.content['#context']['value']]|t %} - - {%- if language.id != 'en' -%} - {{- provided_language|lower -}} - {%- else -%} - {{- provided_language -}} - {%- endif -%} - - {% if not loop.last %}, {% endif %} -{%- endfor -%} diff --git a/templates/module/helfi_tpr/tpr-unit-contact-information.html.twig b/templates/module/helfi_tpr/tpr-unit-contact-information.html.twig index bbacacb1f..90c09090d 100644 --- a/templates/module/helfi_tpr/tpr-unit-contact-information.html.twig +++ b/templates/module/helfi_tpr/tpr-unit-contact-information.html.twig @@ -60,13 +60,13 @@ {{ content.opening_hours }} {% endif %} - {% if content.provided_languages|render %} + {% if content['provided_languages']['#object'].getProvidedLanguagesNames() %}
- {{ content.provided_languages }} + {{ content['provided_languages']['#object'].getProvidedLanguagesNames() }}
{% endif %} {% if content.address_postal|render %} From eb38bbc56e82e45c8e47f38dcb1cb3eef9e7ef77 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Risto=20Nyk=C3=A4nen?= Date: Wed, 12 Mar 2025 14:38:13 +0200 Subject: [PATCH 2/3] minor tweak --- .../module/helfi_tpr/tpr-unit-contact-information.html.twig | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/templates/module/helfi_tpr/tpr-unit-contact-information.html.twig b/templates/module/helfi_tpr/tpr-unit-contact-information.html.twig index 90c09090d..c3d156e9b 100644 --- a/templates/module/helfi_tpr/tpr-unit-contact-information.html.twig +++ b/templates/module/helfi_tpr/tpr-unit-contact-information.html.twig @@ -60,13 +60,13 @@ {{ content.opening_hours }} {% endif %} - {% if content['provided_languages']['#object'].getProvidedLanguagesNames() %} + {% if content.provided_languages['#object'].getProvidedLanguagesNames() %}
- {{ content['provided_languages']['#object'].getProvidedLanguagesNames() }} + {{ content.provided_languages['#object'].getProvidedLanguagesNames() }}
{% endif %} {% if content.address_postal|render %} From 8b6226c0d7b968841ca2a8e134b4cf8f6ba62ca9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Risto=20Nyk=C3=A4nen?= Date: Wed, 12 Mar 2025 14:56:48 +0200 Subject: [PATCH 3/3] typo in function name --- .../module/helfi_tpr/tpr-unit-contact-information.html.twig | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/templates/module/helfi_tpr/tpr-unit-contact-information.html.twig b/templates/module/helfi_tpr/tpr-unit-contact-information.html.twig index c3d156e9b..2abc1a5dc 100644 --- a/templates/module/helfi_tpr/tpr-unit-contact-information.html.twig +++ b/templates/module/helfi_tpr/tpr-unit-contact-information.html.twig @@ -60,13 +60,13 @@ {{ content.opening_hours }} {% endif %} - {% if content.provided_languages['#object'].getProvidedLanguagesNames() %} + {% if content.provided_languages['#object'].getProvidedLanguageNames() %}
- {{ content.provided_languages['#object'].getProvidedLanguagesNames() }} + {{ content.provided_languages['#object'].getProvidedLanguageNames() }}
{% endif %} {% if content.address_postal|render %}