Merge pull request #1025 from City-of-Helsinki/UHF-12443

teroelonen · web-flow · commit efb931252300 · 2026-03-05T13:47:43.000+02:00
UHF-12443: Cross institutional studies search finalization
diff --git a/public/modules/custom/helfi_kasko_content/src/CrossInstitutionalStudies/Controller/SearchController.php b/public/modules/custom/helfi_kasko_content/src/CrossInstitutionalStudies/Controller/SearchController.php
@@ -22,7 +22,7 @@ public function __construct(
    * Returns title for the page.
    */
   public function title(): TranslatableMarkup {
-    return $this->t('Online and distance studies of City of Helsinki general upper secondary schools', [], ['context' => 'Cross institutional studies search']);
+    return $this->t('Online and distance studies of City of Helsinki general upper secondary schools', [], ['context' => 'Cross institutional studies']);
   }
 
   /**
diff --git a/public/modules/custom/helfi_kasko_content/src/Plugin/Block/CrossInstitutionalStudiesHeroBlock.php b/public/modules/custom/helfi_kasko_content/src/Plugin/Block/CrossInstitutionalStudiesHeroBlock.php
@@ -22,7 +22,7 @@ final class CrossInstitutionalStudiesHeroBlock extends BlockBase {
    */
   public function build(): array {
     return [
-      '#hero_title' => $this->t('Online and distance studies of City of Helsinki general upper secondary schools', [], ['context' => 'Cross institutional studies search']),
+      '#hero_title' => $this->t('Online and distance studies of City of Helsinki general upper secondary schools', [], ['context' => 'Cross institutional studies']),
       '#theme' => 'cross_institutional_studies_hero_block',
     ];
   }
diff --git a/public/modules/custom/helfi_kasko_content/translations/fi.po b/public/modules/custom/helfi_kasko_content/translations/fi.po
@@ -259,37 +259,5 @@ msgid "remote learning"
 msgstr "etäopiskelu"
 
 msgctxt "Cross institutional studies"
-msgid "Study unit description"
-msgstr "Opintojakson kuvaus"
-
-msgctxt "Cross institutional studies"
-msgid "Study unit details"
-msgstr "Opintojakson tiedot"
-
-msgctxt "Cross institutional studies"
-msgid "Study unit"
-msgstr "Opintojakso"
-
-msgctxt "Cross institutional studies"
-msgid "Date and time"
-msgstr "Ajankohta"
-
-msgctxt "Cross institutional studies"
-msgid "Mode of teaching"
-msgstr "Opiskelumuoto"
-
-msgctxt "Cross institutional studies"
-msgid "Language of instruction"
-msgstr "Opetuskieli"
-
-msgctxt "Cross institutional studies"
-msgid "Sign up on Wilma"
-msgstr "Ilmoittaudu Wilmassa"
-
-msgctxt "Cross institutional studies"
-msgid "Other options for completing the study unit"
-msgstr "Opintojakson muut suoritusvaihtoehdot"
-
-msgctxt "Cross institutional studies search"
 msgid "Online and distance studies of City of Helsinki general upper secondary schools"
 msgstr "Helsingin kaupungin lukioiden verkko- ja etäopetus"
diff --git a/public/modules/custom/helfi_kasko_content/translations/sv.po b/public/modules/custom/helfi_kasko_content/translations/sv.po
@@ -255,33 +255,5 @@ msgid "remote learning"
 msgstr "distansundervisning"
 
 msgctxt "Cross institutional studies"
-msgid "Study unit description"
-msgstr "Beskrivning av studieavsnittet"
-
-msgctxt "Cross institutional studies"
-msgid "Study unit details"
-msgstr "Uppgifter om studieavsnittet"
-
-msgctxt "Cross institutional studies"
-msgid "Study unit"
-msgstr "Studieavsnitt"
-
-msgctxt "Cross institutional studies"
-msgid "Date and time"
-msgstr "Tidpunkt"
-
-msgctxt "Cross institutional studies"
-msgid "Mode of teaching"
-msgstr "Studieform"
-
-msgctxt "Cross institutional studies"
-msgid "Language of instruction"
-msgstr "Undervisningsspråk"
-
-msgctxt "Cross institutional studies"
-msgid "Sign up on Wilma"
-msgstr "Anmäl dig i Wilma"
-
-msgctxt "Cross institutional studies"
-msgid "Other options for completing the study unit"
-msgstr "Andra alternativ att avlägga studieavsnittet"
+msgid "Online and distance studies of City of Helsinki general upper secondary schools"
+msgstr "Webb- och distansundervisning vid Helsingfors stads gymnasier"
diff --git a/public/themes/custom/hdbt_subtheme/templates/module/helfi_kasko_content/cross-institutional-studies-search.html.twig b/public/themes/custom/hdbt_subtheme/templates/module/helfi_kasko_content/cross-institutional-studies-search.html.twig
@@ -7,8 +7,8 @@
           'component--event-list',
           'component--full-width',
         ],
-        component_title: 'Search for online and distance studies in general upper secondary schools'|t({}, {'context': 'Cross institutional studies search'}),
-        component_description: 'Use this search tool to find online and distance courses offered by the City of Helsinki. You can search for courses by name. You can also filter the results by start time, mode of teaching, level of study, or language of instruction.'|t({}, {'context': 'Cross institutional studies search'}),
+        component_title: 'Search for online and distance studies in general upper secondary schools'|t({}, {'context': 'Cross institutional studies'}),
+        component_description: 'Use this search tool to find online and distance courses offered by the City of Helsinki. You can search for courses by name. You can also filter the results by start time, mode of teaching, level of study, or language of instruction.'|t({}, {'context': 'Cross institutional studies'}),
       }
     %}
       {% block component_content %}
@@ -22,7 +22,7 @@
         {# Indicate JS not enabled #}
         <noscript>
           <div class="event-list__javascript-disabled">
-            {{ 'You must enable JavaScript in your browser for event list to work'|t }}
+            {{ 'You must enable JavaScript in your browser for search to work'|t({}, {'context': 'Cross institutional studies'}) }}
           </div>
         </noscript>
       {% endblock %}
diff --git a/public/themes/custom/hdbt_subtheme/translations/fi.po b/public/themes/custom/hdbt_subtheme/translations/fi.po
@@ -141,76 +141,46 @@ msgid_plural "schools"
 msgstr[0] "koulu"
 msgstr[1] "koulua"
 
-msgctxt "Cross institutional studies search"
+msgctxt "Cross institutional studies"
+msgid "You must enable JavaScript in your browser for search to work"
+msgstr "Haun toimimiseksi sinun tulee sallia JavaScript selaimessasi"
+
+msgctxt "Cross institutional studies"
 msgid "Search for online and distance studies in general upper secondary schools"
 msgstr "Etsi lukioiden verkko- ja etäopetusta"
 
-msgctxt "Cross institutional studies search"
+msgctxt "Cross institutional studies"
 msgid "Use this search tool to find online and distance courses offered by the City of Helsinki. You can search for courses by name. You can also filter the results by start time, mode of teaching, level of study, or language of instruction."
 msgstr "Löydät hausta Helsingin kaupungin verkko- ja etäkurssit. Voit hakea hakusanalla kurssien nimiä. Voit myös rajata tuloksia aloitusajankohdan, opiskelumuodon, opintojen tason tai opetuskielen mukaan."
 
-msgctxt "Cross-institutional studies: search input label"
-msgid "Search word"
-msgstr "Hakusana"
+msgctxt "Cross institutional studies"
+msgid "Study unit description"
+msgstr "Opintojakson kuvaus"
 
-msgctxt "Cross-institutional studies: search input placeholder"
-msgid "E.g. biology"
-msgstr "Esim. Biologia"
+msgctxt "Cross institutional studies"
+msgid "Study unit details"
+msgstr "Opintojakson tiedot"
 
-msgctxt "Cross-institutional studies: start time filter label"
-msgid "Start time"
-msgstr "Aloitusajankohta"
+msgctxt "Cross institutional studies"
+msgid "Study unit"
+msgstr "Opintojakso"
 
-msgctxt "Cross-institutional studies: start time filter placeholder"
-msgid "All start times"
-msgstr "Kaikki aloitusajankohdat"
+msgctxt "Cross institutional studies"
+msgid "Date and time"
+msgstr "Ajankohta"
 
-msgctxt "Cross-institutional studies: Teaching mode filter label"
+msgctxt "Cross institutional studies"
 msgid "Mode of teaching"
 msgstr "Opiskelumuoto"
 
-msgctxt "Cross-institutional studies: Teaching mode filter placeholder"
-msgid "All modes of teaching"
-msgstr "Kaikki opiskelumuodot"
-
-msgctxt "Cross-institutional studies: Teaching mode filter option"
-msgid "Contact teaching"
-msgstr "Lähiopetus"
-
-msgctxt "Cross-institutional studies: Teaching mode filter option"
-msgid "Remote teaching"
-msgstr "Etäopetus"
-
-msgctxt "Cross-institutional studies: Teaching mode filter option"
-msgid "Hybrid teaching"
-msgstr "Monimuoto-opetus"
-
-msgctxt "Cross-institutional studies: Teaching mode filter option"
-msgid "Online teaching"
-msgstr "Verkko-opetus"
-
-msgctxt "Cross-institutional studies: language of instruction filter label"
+msgctxt "Cross institutional studies"
 msgid "Language of instruction"
 msgstr "Opetuskieli"
 
-msgctxt "Cross-institutional studies: language of instruction filter placeholder"
-msgid "All languages of instruction"
-msgstr "Kaikki opetuskielet"
-
-msgctxt "Cross institutional studies search: result count"
-msgid "1 course"
-msgid_plural "@count courses"
-msgstr[0] "1 kurssi"
-msgstr[1] "@count kurssia"
-
-msgctxt "Cross-institutional studies: sort label"
-msgid "Sort search results"
-msgstr "Järjestä hakutulokset"
+msgctxt "Cross institutional studies"
+msgid "Sign up on Wilma"
+msgstr "Ilmoittaudu Wilmassa"
 
-msgctxt "Cross-institutional studies: sort option"
-msgid "Alphabetical order"
-msgstr "Aakkosjärjestys"
-
-msgctxt "Cross-institutional studies"
-msgid "Date and time"
-msgstr "Ajankohta"
+msgctxt "Cross institutional studies"
+msgid "Other options for completing the study unit"
+msgstr "Opintojakson muut suoritusvaihtoehdot"
diff --git a/public/themes/custom/hdbt_subtheme/translations/sv.po b/public/themes/custom/hdbt_subtheme/translations/sv.po
@@ -131,3 +131,47 @@ msgid "school"
 msgid_plural "schools"
 msgstr[0] "skola"
 msgstr[1] "skolor"
+
+msgctxt "Cross institutional studies"
+msgid "You must enable JavaScript in your browser for search to work"
+msgstr "Du måste aktivera JavaScript i din webbläsare för att sökningen ska fungera"
+
+msgctxt "Cross institutional studies"
+msgid "Search for online and distance studies in general upper secondary schools"
+msgstr "Sök gymnasiers webb- och distansundervisning"
+
+msgctxt "Cross institutional studies"
+msgid "Use this search tool to find online and distance courses offered by the City of Helsinki. You can search for courses by name. You can also filter the results by start time, mode of teaching, level of study, or language of instruction."
+msgstr "Du hittar Helsingfors stads webb- och distanskurser i sökningen. Med ett sökord kan du söka kursernas namn. Du kan också avgränsa resultaten efter starttidpunkt, studieform, studienivå eller undervisningsspråk."
+
+msgctxt "Cross institutional studies"
+msgid "Study unit description"
+msgstr "Beskrivning av studieavsnittet"
+
+msgctxt "Cross institutional studies"
+msgid "Study unit details"
+msgstr "Uppgifter om studieavsnittet"
+
+msgctxt "Cross institutional studies"
+msgid "Study unit"
+msgstr "Studieavsnitt"
+
+msgctxt "Cross institutional studies"
+msgid "Date and time"
+msgstr "Tidpunkt"
+
+msgctxt "Cross institutional studies"
+msgid "Mode of teaching"
+msgstr "Studieform"
+
+msgctxt "Cross institutional studies"
+msgid "Language of instruction"
+msgstr "Undervisningsspråk"
+
+msgctxt "Cross institutional studies"
+msgid "Sign up on Wilma"
+msgstr "Anmäl dig i Wilma"
+
+msgctxt "Cross institutional studies"
+msgid "Other options for completing the study unit"
+msgstr "Andra alternativ att avlägga studieavsnittet"

Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ public function __construct(`
`22`	`22`	`* Returns title for the page.`
`23`	`23`	`*/`
`24`	`24`	`public function title(): TranslatableMarkup {`
`25`		`- return $this->t('Online and distance studies of City of Helsinki general upper secondary schools', [], ['context' => 'Cross institutional studies search']);`
	`25`	`+ return $this->t('Online and distance studies of City of Helsinki general upper secondary schools', [], ['context' => 'Cross institutional studies']);`
`26`	`26`	`}`
`27`	`27`
`28`	`28`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ final class CrossInstitutionalStudiesHeroBlock extends BlockBase {`
`22`	`22`	`*/`
`23`	`23`	`public function build(): array {`
`24`	`24`	`return [`
`25`		`- '#hero_title' => $this->t('Online and distance studies of City of Helsinki general upper secondary schools', [], ['context' => 'Cross institutional studies search']),`
	`25`	`+ '#hero_title' => $this->t('Online and distance studies of City of Helsinki general upper secondary schools', [], ['context' => 'Cross institutional studies']),`
`26`	`26`	`'#theme' => 'cross_institutional_studies_hero_block',`
`27`	`27`	`];`
`28`	`28`	`}`