Merge branch 'dev' into update-configuration

Author: annadruid

conf/cmi/language/sv/block.block.hdbt_admin_admin.yml

@@ -1,3 +1,2 @@
 settings:
   label: Administration
-  label_display: synlig

conf/cmi/language/sv/block.block.hdbt_admin_tools.yml

@@ -1,3 +1,2 @@
 settings:
   label: Verktyg
-  label_display: synlig

public/modules/custom/helfi_kasko_content/src/Plugin/search_api/processor/AdditionalFilters.php

@@ -28,6 +28,8 @@ class AdditionalFilters extends ProcessorPluginBase {
 
   use SupportsUnitIndexTrait;
 
+  const ENGLISH_EDUCATION_TERM_IDS = [149, 150];
+
   /**
    * {@inheritdoc}
    */
@@ -65,6 +67,7 @@ public function addFieldValues(ItemInterface $item): void {
       'grades_7_9' => UnitCategoryUtility::entityHasCategory($object, UnitCategoryUtility::GRADES_7_9),
       'finnish_education' => UnitCategoryUtility::entityHasCategory($object, UnitCategoryUtility::FINNISH_BASIC_EDUCATION),
       'swedish_education' => UnitCategoryUtility::entityHasCategory($object, UnitCategoryUtility::SWEDISH_BASIC_EDUCATION),
+      'english_education' => $this->hasEnglishEducation($object),
     ];
 
     $itemFields = $item->getFields();
@@ -75,4 +78,26 @@ public function addFieldValues(ItemInterface $item): void {
     }
   }
 
+  /**
+   * Check if entity has English education category.
+   *
+   * @param \Drupal\helfi_tpr\Entity\TprEntityBase $entity
+   *   The TPR entity.
+   *
+   * @return bool
+   *   TRUE if entity has English education category, FALSE otherwise.
+   */
+  private function hasEnglishEducation(TprEntityBase $entity): bool {
+    if (!$entity->hasField('ontologyword_ids')) {
+      return FALSE;
+    }
+
+    foreach ($entity->get('ontologyword_ids')->getValue() as $term) {
+      if (in_array($term['value'], self::ENGLISH_EDUCATION_TERM_IDS)) {
+        return TRUE;
+      }
+    }
+    return FALSE;
+  }
+
 }

public/modules/custom/helfi_kasko_content/translations/fi.po

@@ -66,10 +66,6 @@ msgctxt "TPR Ontologyword details schools"
 msgid "Weighted curriculum education starting in 7th grade"
 msgstr "7. luokalta alkava painotettu opetus"
 
-msgctxt "TPR Ontologyword details schools"
-msgid "Teaching in English"
-msgstr "Englanninkielinen opetus"
-
 msgctxt "TPR Ontologyword details schools"
 msgid "Finnish-English"
 msgstr "suomi-englanti"

public/modules/custom/helfi_kasko_content/translations/sv.po

@@ -66,10 +66,6 @@ msgctxt "TPR Ontologyword details schools"
 msgid "Weighted curriculum education starting in 7th grade"
 msgstr "Intensifierad undervisning som börjar i åk 7"
 
-msgctxt "TPR Ontologyword details schools"
-msgid "Teaching in English"
-msgstr "Undervisning på engelska"
-
 msgctxt "TPR Ontologyword details schools"
 msgid "Finnish-English"
 msgstr "finska-engelska"