Updated all the contrib modules to their latest versions.
[yaffs-website] / web / modules / contrib / permissions_by_term / src / Listener / KernelEventListener.php
index 5473fe4d61bef1de33af6ba8b1fa8787e341eca1..10ee63b2e6e34289a7fb918022409d6c82ce1ce7 100644 (file)
@@ -6,7 +6,7 @@ use Drupal\Component\EventDispatcher\ContainerAwareEventDispatcher;
 use Drupal\permissions_by_term\Event\PermissionsByTermDeniedEvent;
 use Drupal\permissions_by_term\Service\AccessCheck;
 use Drupal\permissions_by_term\Service\AccessStorage;
-use Drupal\permissions_by_term\Service\Term;
+use Drupal\permissions_by_term\Service\TermHandler;
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
 use Symfony\Component\HttpFoundation\JsonResponse;
 use Symfony\Component\HttpFoundation\RedirectResponse;
@@ -29,7 +29,7 @@ class KernelEventListener implements EventSubscriberInterface
   private $accessCheckService;
 
   /**
-   * @var Term
+   * @var TermHandler
    */
   private $term;
 
@@ -50,7 +50,7 @@ class KernelEventListener implements EventSubscriberInterface
   {
     $this->accessCheckService = \Drupal::service('permissions_by_term.access_check');
     $this->accessStorageService = \Drupal::service('permissions_by_term.access_storage');
-    $this->term = \Drupal::service('permissions_by_term.term');
+    $this->term = \Drupal::service('permissions_by_term.term_handler');
     $this->eventDispatcher = \Drupal::service('event_dispatcher');
   }
 
@@ -79,7 +79,7 @@ class KernelEventListener implements EventSubscriberInterface
       $tid = $this->term->getTermIdByName($query_string);
 
       $term = $this->term->getTerm();
-      $termLangcode = 'en';
+      $termLangcode = \Drupal::languageManager()->getCurrentLanguage()->getId();
       if ($term instanceof \Drupal\taxonomy\Entity\Term) {
         $termLangcode = $term->language()->getId();
       }
@@ -109,7 +109,7 @@ class KernelEventListener implements EventSubscriberInterface
       $allowed_terms = [];
       foreach ($suggested_terms as $term) {
         $tid = $this->term->getTermIdByName($term->label);
-        $termLangcode = 'en';
+        $termLangcode = \Drupal::languageManager()->getCurrentLanguage()->getId();
         if ($this->term->getTerm() instanceof \Drupal\taxonomy\Entity\Term) {
           $termLangcode = $this->term->getTerm()->language()->getId();
         }