Merge pull request #23817 from civicrm/5.51

[civicrm-core.git] / Civi / API / Subscriber / I18nSubscriber.php

diff --git a/Civi/API/Subscriber/I18nSubscriber.php b/Civi/API/Subscriber/I18nSubscriber.php
index cad932dd4e9f2381a358c67e6f98aea161b81bb8..d3b732972a2a17f59698a3a32d172858823edeaf 100644 (file)
--- a/Civi/API/Subscriber/I18nSubscriber.php
+++ b/Civi/API/Subscriber/I18nSubscriber.php
@@ -32,8 +32,8 @@ class I18nSubscriber implements EventSubscriberInterface {
    */
   public static function getSubscribedEvents() {
     return [
-      Events::PREPARE => ['onApiPrepare', Events::W_MIDDLE],
-      Events::RESPOND => ['onApiRespond', Events::W_LATE],
+      'civi.api.prepare' => ['onApiPrepare', Events::W_MIDDLE],
+      'civi.api.respond' => ['onApiRespond', Events::W_LATE],
     ];
   }
 
@@ -50,10 +50,10 @@ class I18nSubscriber implements EventSubscriberInterface {
 
     $params = $apiRequest['params'];
     if ($apiRequest['version'] < 4) {
-      $language = !empty($params['options']['language']) ? $params['options']['language'] : \CRM_Utils_Array::value('option.language', $params);
+      $language = $params['options']['language'] ?? $params['option.language'] ?? NULL;
     }
     else {
-      $language = \CRM_Utils_Array::value('language', $params);
+      $language = $params['language'] ?? NULL;
     }
     if ($language) {
       $this->setLocale($language, $apiRequest['id']);