APIv4 $languages - Adapt based on 'partial_locales' setting

diff --git a/Civi/Api4/Action/GetActions.php b/Civi/Api4/Action/GetActions.php
index 1720ee701655f33bc10c327498611366f2332fe8..5f3dbd9a619761e8d3e4e94ec3e860a5caa486dd 100644 (file)
--- a/Civi/Api4/Action/GetActions.php
+++ b/Civi/Api4/Action/GetActions.php
@@ -99,14 +99,6 @@ class GetActions extends BasicGetAction {
           }
           if ($this->_isFieldSelected('params')) {
             $this->_actions[$actionName]['params'] = $action->getParamInfo();
-            // Language param is only relevant on multilingual sites
-            $languageLimit = (array) \Civi::settings()->get('languageLimit');
-            if (count($languageLimit) < 2) {
-              unset($this->_actions[$actionName]['params']['language']);
-            }
-            elseif (isset($this->_actions[$actionName]['params']['language'])) {
-              $this->_actions[$actionName]['params']['language']['options'] = array_keys($languageLimit);
-            }
           }
         }
       }

diff --git a/Civi/Api4/Generic/AbstractAction.php b/Civi/Api4/Generic/AbstractAction.php
index 51c76450b7c5b35a0ee7793f4afbd2f0be4c3f6e..5ad1a3e45826d6a92fa0925ec940a15c52ec8ec9 100644 (file)
--- a/Civi/Api4/Generic/AbstractAction.php
+++ b/Civi/Api4/Generic/AbstractAction.php
@@ -56,7 +56,7 @@ abstract class AbstractAction implements \ArrayAccess {
    * by `Civi\Core\Locale::negotiate($preferredLanguage)`.
    *
    * @var string
-   * @optionsCallback getPreferredLanguageOptions
+   * @optionsCallback getLanguageOptions
    */
   protected $language;
 
@@ -585,10 +585,15 @@ abstract class AbstractAction implements \ArrayAccess {
    *
    * @return array
    */
-  protected function getPreferredLanguageOptions(): array {
+  protected function getLanguageOptions(): array {
     $languages = \CRM_Contact_BAO_Contact::buildOptions('preferred_language');
     ksort($languages);
-    return array_keys($languages);
+    $result = array_keys($languages);
+    if (!\Civi::settings()->get('partial_locales')) {
+      $uiLanguages = \CRM_Core_I18n::uiLanguages(TRUE);
+      $result = array_values(array_intersect($result, $uiLanguages));
+    }
+    return $result;
   }
 
 }