fix: UHF-10711: Form & translation fixes (#1580)

* UHF-10711: Form & translation fixes

* UHF-10711: Form title + description

* UHF-10711: Target group fix.

* UHF-10711: Grant type translations.

conf/cmi/grants_metadata.settings.yml

@@ -291,14 +291,14 @@ third_party_options:
     44: 'Development grant'
     45: 'Development grant for the Helsinki Model'
     46: 'Development grant for basic arts education'
-    47: 'Kulttuurin erityisavustus 1'
-    48: 'Kulttuurin erityisavustus 2'
-    49: 'Nuorison erityisavustus 1'
-    50: 'Nuorison erityisavustus 2'
-    51: 'Liikunnan erityisavustus 1'
-    52: 'Liikunnan erityisavustus 2'
-    53: 'Kulttuurin ja vapaa-ajan erityisavustus 1'
-    54: 'Kulttuurin ja vapaa-ajan erityisavustus 2'
+    47: 'Special grant for culture 1'
+    48: 'Special grant for culture 2'
+    49: 'Special grant for youth activities 1'
+    50: 'Special grant for youth activities 2'
+    51: 'Special grant for sports 1'
+    52: 'Special grant for sports 2'
+    53: 'Special grant for culture and leisure 1'
+    54: 'Special grant for culture and leisure 2'
 langcode: en
 config_import_ignore:
   - 53

conf/cmi/language/en/webform.webform.iakkaiden_kulttuuri_ja_liikunta.yml

@@ -2,21 +2,21 @@ title: 'KUVA: Culture grant for advancing cultural activities for the elderly'
 elements: |
   1_hakijan_tiedot:
     '#title': '1. Applicant details'
-    '#prev_button_label': 'Previous'
-    '#next_button_label': 'Next'
+    '#prev_button_label': Previous
+    '#next_button_label': Next
   hakemusprofiili:
     '#title': 'Retrieved information'
   prh_markup:
-    '#markup': 'The information has been retrieved from your own profile.'
+    '#markup': '<p>The information has been retrieved from your own profile.</p>'
   hakijan_tiedot:
-    '#title': 'Applicant'
+    '#title': Applicant
   contact_person_email_section:
     '#title': Email
   contact_markup:
-    '#markup': 'Provide here a community email address that is actively read. Contact requests related to the grant application, such as requests for further clarification and completion, will be sent to the email address.'
+    '#markup': '<p>Provide here a community email address that is actively read. Contact requests related to the grant application, such as requests for further clarification and completion, will be sent to the email address.</p>'
   email:
     '#title': 'Email address'
-    '#help': 'Provide the email address to which you want the messages and notifications related to this application to be sent and which is actively read.'
+    '#help': '<p>Provide the email address to which you want the messages and notifications related to this application to be sent and which is actively read.</p>'
   contact_person_section:
     '#title': 'Contact person for the application'
   contact_person:
@@ -27,19 +27,19 @@ elements: |
     '#title': Address
   community_address:
     '#title': Address
-    '#help': 'If you want to add, delete or change address information, save the application as a draft and go to maintain the address information in your own data.'
+    '#help': '<p>If you want to add, delete or change address information, save the application as a draft and go to maintain the address information in your own data.</p>'
     '#community_address_select__title': 'Select the address'
   tilinumero:
     '#title': 'Account number'
   bank_account:
     '#title': 'Account number'
-    '#help': 'If you want to add, delete or change account number information, save the application as a draft and go to maintain the account number information in your own data.'
+    '#help': '<p>If you want to add, delete or change account number information, save the application as a draft and go to maintain the account number information in your own data.</p>'
     '#account_number_select__title': 'Select the account number'
     '#account_number__title': ''
   toiminnasta_vastaavat_henkilot:
     '#title': 'Persons responsible for operations'
   community_officials:
-    '#help': 'If you want to add, delete or change people, save the application as a draft and go to maintain the people&#39;s information in your own data.'
+    '#help': "<p>If you want to add, delete or change people, save the application as a draft and go to maintain the people's information in your own data.</p>"
     '#title': 'Persons responsible for operations'
     '#multiple__add_more_button_label': 'Add person'
     '#community_officials_select__title': 'Select official'
@@ -62,8 +62,8 @@ elements: |
     '#title': 'Purpose of use'
   compensation_purpose:
     '#title': 'Brief description of the purpose(s) of the grant(s) applied for'
+    '#help': '<p>Indicate the purpose for which the grant is applied for. If necessary, specify the different uses. Also tell us what is intended to be achieved with the grant and what goals are associated with the activities to be supported.</p>'
     '#counter_maximum_message': '%d/5000 characters remaining'
-    '#help': 'Indicate the purpose for which the grant is applied for. If necessary, specify the different uses. Also tell us what is intended to be achieved with the grant and what goals are associated with the activities to be supported.'
   other_grants_for_same_purpose:
     '#title': 'Other grants applied for to be used for the same purpose'
   info_muut_samaan_tarkoitukseen_myonnetty:
@@ -75,7 +75,7 @@ elements: |
       0: 'No'
   myonnetty_avustus:
     '#title': 'Received grant'
-    '#multiple__no_items_message': 'No values entered. Add the new grant granted below.'
+    '#multiple__no_items_message': '<p>No values entered. Add the new grant granted below.</p>'
     '#multiple__add_more_button_label': 'Add received grant'
     '#element':
       issuer:
@@ -85,29 +85,29 @@ elements: |
           5: Foundation
         '#title': 'Grant issuer'
       issuer_name:
-        '#title': 'Issuer''s name'
-        '#help': 'Which body has granted the grant (e.g. name of the ministry)'
+        '#title': "Issuer's name"
+        '#help': '<p>Which body has granted the grant (e.g. name of the ministry)</p>'
       year:
         '#title': Year
         '#pattern_error': 'Only numbers'
       amount:
         '#title': 'Amount of grant granted'
       purpose:
         '#title': 'Description of intended use'
-        '#help': 'Give a brief description, for what purpose has the grant been granted?'
+        '#help': '<p>Give a brief description, for what purpose has the grant been granted?</p>'
         '#counter_maximum_message': '%d/1000 characters remaining'
   muut_samaan_tarkoitukseen_haetut_avustukset:
     '#title': 'Other grants applied for to be used for the same purpose'
   info_muut_samaan_tarkoitukseen_haettu:
-    '#markup': "<p>Indicate here only the grants that have been applied for from somewhere other than the City of Helsinki and for which the decisions have not been made yet.</p>\r\n\r\n<div class=\"hds-notification hds-notification--info\">\r\n<div class=\"hds-notification__content\">\r\n<div class=\"hds-notification__label\"><span>An affirmative answer opens a further question</span></div>\r\n</div>\r\n</div>\r\n"
+    '#markup': '<p>Indicate here only the grants that have been applied for from somewhere other than the City of Helsinki and for which the decisions have not been made yet.</p><div class="hds-notification hds-notification--info"><div class="hds-notification__content"><div class="hds-notification__label"><span>An affirmative answer opens a further question</span></div></div></div>'
   olemme_hakeneet_avustuksia_muualta_kuin_helsingin_kaupungilta:
     '#title': 'We have applied for grants from somewhere other than the City of Helsinki'
     '#options':
       1: 'Yes'
       0: 'No'
   haettu_avustus_tieto:
     '#title': 'Add new grant applied for'
-    '#multiple__no_items_message': 'No values entered. Add a new applied for grant below.'
+    '#multiple__no_items_message': '<p>No values entered. Add a new applied for grant below.</p>'
     '#multiple__add_more_button_label': 'Add new grant applied for'
     '#element':
       issuer:
@@ -117,22 +117,24 @@ elements: |
           5: Foundation
         '#title': 'Grant issuer'
       issuer_name:
-        '#title': 'Issuer''s name'
-        '#help': 'Which entity has granted the grant (e.g. name of the ministry)'
+        '#title': "Issuer's name"
+        '#help': '<p>Which entity has granted the grant (e.g. name of the ministry)</p>'
       year:
         '#title': Year
         '#pattern_error': 'Only numbers'
       amount:
         '#title': 'The amount of the grant applied for'
       purpose:
         '#title': 'Description of intended use'
-        '#help': 'Give a brief description, for what purpose has the grant been granted?'
+        '#help': '<p>Give a brief description, for what purpose has the grant been granted?</p>'
         '#counter_maximum_message': '%d/1000 characters remaining'
   3_tarkemmat_tiedot:
     '#title': '3. Information in more detail'
+  markup:
+    '#markup': '<p data-renderer-start-pos="6888">Grant decisions for 2024:</p><ul class="ak-ul" data-indent-level="1"><li><p data-renderer-start-pos="6917">Sports Sub-committee: 11 April 2024 Section 10</p></li><li><p data-renderer-start-pos="6969">Culture and Libraries Sub-committee: 16 April 2024 Section 15</p></li></ul>'
   hankesuunnitelma_radios:
     '#title': 'Is the 2nd part of the grant awarded in 2024 now being applied for?'
-    '#help': 'Only answer “yes” to this question if your community already has an ongoing project funded by the same grant and you are applying for additional funding for it.'
+    '#help': '<p>Only answer “yes” to this question if your community already has an ongoing project funded by the same grant and you are applying for additional funding for it.</p>'
     '#options':
       1: 'Yes'
       0: 'No'
@@ -177,7 +179,7 @@ elements: |
   haun_painopisteet_section:
     '#title': '3.2 Emphases of the grant program'
   haun_painopisteet_ohje:
-    '#markup': '<b>Which of the following areas of emphasis of the grant for the promotion of sport and physical activity for the elderly does the project cover? <p>One or more areas must be implemented in the project. PLEASE NOTE: Only select the areas that you will contribute to in the project in a concrete way.</p>'
+    '#markup': '<p data-renderer-start-pos="16291"><strong data-renderer-mark="true">Which of the following areas of emphasis of the grant for the promotion of sport and physical activity for the elderly does the project cover?</strong></p><p data-renderer-start-pos="16435">One or more areas must be implemented in the project. PLEASE NOTE: Only select the areas that you will contribute to in the project in a concrete way.</p>'
   haun_painopisteet_liikkumis_kehitys:
     '#title': 'Does the project develop sport and physical activity opportunities or art and cultural activities in the immediate environment / area? How?'
     '#counter_maximum_message': '%d/1250 characters remaining'
@@ -197,8 +199,8 @@ elements: |
     '#counter_maximum_message': '%d/1250 characters remaining'
   hankkeen_kohderyhmat_erityisryhmat:
     '#title': 'Does the project target a special group?'
+    '#help': '<p>For which special group? If not implemented, leave the field blank.</p>'
     '#counter_maximum_message': '%d/1250 characters remaining'
-    '#help': 'For which special group? If not implemented, leave the field blank.'
   hankkeen_kohderyhmat_tavoitus:
     '#title': 'How will the target groups of the project be reached?'
     '#counter_maximum_message': '%d/1250 characters remaining'
@@ -213,7 +215,7 @@ elements: |
     '#counter_maximum_message': '%d/1250 characters remaining'
   hankkeen_kohderyhmat_postinrot:
     '#title': 'In which postal code area(s) in Helsinki will the project be implemented?'
-    '#help': 'Please enter up to three (3) postal code areas in the field and separate them with a comma (,).'
+    '#help': '<p>Please enter up to three (3) postal code areas in the field and separate them with a comma (,).</p>'
   hankkeen_kohderyhmat_miksi_alue:
     '#title': 'Why is/are that particular area(s) selected?'
     '#counter_maximum_message': '%d/1250 characters remaining'
@@ -253,8 +255,8 @@ elements: |
     '#title': 'How have the activities reached the participants in relation to the goals?'
     '#counter_maximum_message': '%d/1250 characters remaining'
   arviointi_avustus_kaytto:
-    '#title': 'Is the grant for the first project period expected to be used by the deadline of 31 May 2025? If not, please explain the reasons that led to this.'
     '#help': '<p>Grant conditions, section 10e: “A grant that has been granted must be returned to the City of Helsinki, the grant has not been used within the period as set down in the grant decision.”</p>'
+    '#title': 'Is the grant for the first project period expected to be used by the deadline of 31 May 2025? If not, please explain the reasons that led to this.'
     '#counter_maximum_message': '%d/1250 characters remaining'
   4_talousarvio:
     '#title': '4. Planned budget'
@@ -304,10 +306,10 @@ elements: |
   actions:
     '#submit__label': Submit
     '#draft__label': 'Save as draft'
-    '#wizard_prev__label': 'Previous'
-    '#wizard_next__label': 'Next'
-    '#preview_prev__label': 'Previous'
-    '#preview_next__label': 'Preview'
+    '#wizard_prev__label': Previous
+    '#wizard_next__label': Next
+    '#preview_prev__label': Previous
+    '#preview_next__label': Preview
     '#delete__label': 'Delete unfinished'
 settings:
   wizard_confirmation_label: '7. Complete'

conf/cmi/language/fi/grants_metadata.settings.yml

@@ -69,4 +69,12 @@ third_party_options:
     44: Kehittämisavustus
     45: 'Helsingin mallin kehittämisavustus'
     46: 'Taiteen perusopetuksen kehittämisavustus'
+    47: 'Kulttuurin erityisavustus 1'
+    48: 'Kulttuurin erityisavustus 2'
+    49: 'Nuorison erityisavustus 1'
+    50: 'Nuorison erityisavustus 2'
+    51: 'Liikunnan erityisavustus 1'
+    52: 'Liikunnan erityisavustus 2'
+    53: 'Kulttuurin ja vapaa-ajan erityisavustus 1'
+    54: 'Kulttuurin ja vapaa-ajan erityisavustus 2'
 langcode: fi

conf/cmi/language/sv/grants_metadata.settings.yml

@@ -69,4 +69,12 @@ third_party_options:
     44: Utvecklingsunderstöd
     45: 'Utvecklingsunderstöd för Helsingforsmodellen'
     46: 'Utvecklingsunderstöd för grundläggande konstundervisning'
+    47: 'Specialunderstöd för kultur 1'
+    48: 'Specialunderstöd för kultur 2'
+    49: 'Specialunderstöd för ungdomsverksamhet 1'
+    50: 'Specialunderstöd för ungdomsverksamhet 2'
+    51: 'Specialunderstöd för idrott 1'
+    52: 'Specialunderstöd för idrott 2'
+    53: 'Specialunderstöd för kultur och fritid 1'
+    54: 'Specialunderstöd för kultur och fritid 2'
 langcode: sv

conf/cmi/language/sv/webform.webform.iakkaiden_kulttuuri_ja_liikunta.yml

@@ -56,14 +56,14 @@ elements: |
     '#title': Understöd
   subventions:
     '#title': 'Typ av stöd'
-  kayttotarkoitus:
-    '#title': 'Användningsän damål'
   grants_compensations_information:
     '#markup': '<p>Ansök alltid endast om en typ av understöd åt gången.</p>'
+  kayttotarkoitus:
+    '#title': 'Användningsän damål'
   compensation_purpose:
     '#title': 'En kort beskrivning av användningsändamålet för det/de understöd som ansöks'
+    '#help': '<p>Ange för vilket ändamål understödet ansöks och vid behov specificera de olika ändamålen. Ange också vad understödet är avsett för och vilka mål som är relaterade till den understödda verksamheten.</p>'
     '#counter_maximum_message': '%d/5000 tecken kvar'
-    '#help': 'Ange för vilket ändamål understödet ansöks och vid behov specificera de olika ändamålen. Ange också vad understödet är avsett för och vilka mål som är relaterade till den understödda verksamheten.'
   other_grants_for_same_purpose:
     '#title': 'Övriga understöd som beviljats för samma ändamål'
   info_muut_samaan_tarkoitukseen_myonnetty:
@@ -130,6 +130,8 @@ elements: |
         '#counter_maximum_message': '%d/1000 tecken kvar'
   3_tarkemmat_tiedot:
     '#title': '3. Mer detaljerad information'
+  markup:
+    '#markup': '<p data-renderer-start-pos="7036">Beslut om understöd för 2024:</p><ul class="ak-ul" data-indent-level="1"><li><p data-renderer-start-pos="7069">Idrottssektionen: 11.4.2024 §10</p></li><li><p data-renderer-start-pos="7104">Kultur- och bibliotekssektionen: 16.4.2024 §15</p></li></ul>'
   hankesuunnitelma_radios:
     '#title': 'Ansöker du nu om den andra delen av ett tvåårigt understöd som beviljades 2024?'
     '#help': '<p>Svara bara ”ja” på den här frågan om din sammanslutning redan har ett pågående projekt som finansieras med samma understöd och du ansöker om fortsatt finansiering.</p>'
@@ -177,7 +179,7 @@ elements: |
   haun_painopisteet_section:
     '#title': '3.2 Tyngdpunkter för ansökan'
   haun_painopisteet_ohje:
-    '#markup': '<p>Projektet ska arbeta för en eller flera tyngdpunkter. OBS! Välj bara de tyngdpunkter som ni kommer att bidra till på ett konkret sätt genom projektet.</p>'
+    '#markup': '<p data-renderer-start-pos="16591"><strong data-renderer-mark="true">Vilken av följande tyngdpunkter för understödet för främjande av idrott hos äldre är projektet inriktat på?</strong></p><p data-renderer-start-pos="16700">Projektet ska arbeta för en eller flera tyngdpunkter. OBS! Välj bara de tyngdpunkter som ni kommer att bidra till på ett konkret sätt genom projektet.</p>'
   haun_painopisteet_liikkumis_kehitys:
     '#title': 'Bidrar projektet till att utveckla möjligheter till idrott eller konst- och kulturverksamhet i närområdet/regionalt? På vilket sätt?'
     '#counter_maximum_message': '%d/1250 tecken kvar'
@@ -197,8 +199,8 @@ elements: |
     '#counter_maximum_message': '%d/1250 tecken kvar'
   hankkeen_kohderyhmat_erityisryhmat:
     '#title': 'Riktar sig projektet till någon särskild grupp?'
+    '#help': '<p>Till vilken särskild grupp? Om svaret är ”nej”, lämna tomt.</p>'
     '#counter_maximum_message': '%d/1250 tecken kvar'
-    '#help': 'Till vilken särskild grupp? Om svaret är ”nej”, lämna tomt.'
   hankkeen_kohderyhmat_tavoitus:
     '#title': 'Hur ska ni nå ut med projektet till målgrupperna?'
     '#counter_maximum_message': '%d/1250 tecken kvar'
@@ -213,7 +215,7 @@ elements: |
     '#counter_maximum_message': '%d/1250 tecken kvar'
   hankkeen_kohderyhmat_postinrot:
     '#title': 'Inom vilket/vilka postnummerområden i Helsingfors kommer projektet att genomföras?'
-    '#help': 'Ange upp till tre (3) postnummerområden och separera dem med kommatecken (,).'
+    '#help': '<p>Ange upp till tre (3) postnummerområden och separera dem med kommatecken (,).</p>'
   hankkeen_kohderyhmat_miksi_alue:
     '#title': 'Varför har ni valt just det/de områdena?'
     '#counter_maximum_message': '%d/1250 tecken kvar'
@@ -227,7 +229,6 @@ elements: |
     '#counter_maximum_message': '%d/2500 tecken kvar'
   hankkeen_riskit_vakiinnuttaminen:
     '#title': 'Är den planerade verksamheten för projektet avsedd att bli en permanent del av den grundläggande verksamheten hos den sökande/en annan aktör efter projektet?'
-    '#help': '<p>Om ja, beskriv i textrutan hur det här kommer att ske, lämna annars tomt.</p>'
     '#counter_maximum_message': '%d/2500 tecken kvar'
   hankkeen_valiarviointi_section:
     '#title': '3.5 Mellanutvärderin g av tvååriga projekt'