From 0d720c3cc6d3035eed60d892d84afe755ee7e2b5 Mon Sep 17 00:00:00 2001
From: catch <catch@35733.no-reply.drupal.org>
Date: Mon, 6 Feb 2023 13:21:29 +0000
Subject: [PATCH] Issue #2575843 by raman.b, ankithashetty, tassilogroeper,
Hardik_Patel_12, smustgrave: Cleanup ContentTranslationHandler
---
.../src/ContentTranslationHandler.php | 55 +++++++++++--------
1 file changed, 31 insertions(+), 24 deletions(-)
diff --git a/core/modules/content_translation/src/ContentTranslationHandler.php b/core/modules/content_translation/src/ContentTranslationHandler.php
index 24caa245c7c4..7bacd9379cbb 100644
--- a/core/modules/content_translation/src/ContentTranslationHandler.php
+++ b/core/modules/content_translation/src/ContentTranslationHandler.php
@@ -563,13 +563,21 @@ public function entityFormAlter(array &$form, FormStateInterface $form_state, En
*
* @see \Drupal\content_translation\ContentTranslationHandler::entityFormAlter()
*/
- public function entityFormSharedElements($element, FormStateInterface $form_state, $form) {
+ public function entityFormSharedElements(array $element, FormStateInterface $form_state, $form) {
static $ignored_types;
// @todo Find a more reliable way to determine if a form element concerns a
// multilingual value.
if (!isset($ignored_types)) {
- $ignored_types = array_flip(['actions', 'value', 'hidden', 'vertical_tabs', 'token', 'details', 'link']);
+ $ignored_types = array_flip([
+ 'actions',
+ 'value',
+ 'hidden',
+ 'vertical_tabs',
+ 'token',
+ 'details',
+ 'link',
+ ]);
}
/** @var \Drupal\Core\Entity\ContentEntityForm $form_object */
@@ -590,31 +598,30 @@ public function entityFormSharedElements($element, FormStateInterface $form_stat
if (!isset($element[$key]['#type'])) {
$this->entityFormSharedElements($element[$key], $form_state, $form);
}
- else {
- // Ignore non-widget form elements.
- if (isset($ignored_types[$element[$key]['#type']])) {
- continue;
+ // Ignore non-widget form elements.
+ if (isset($ignored_types[$element[$key]['#type']])) {
+ continue;
+ }
+ // Elements are considered to be non-multilingual by default.
+ if (!empty($element[$key]['#multilingual'])) {
+ continue;
+ }
+ // If we are displaying a multilingual entity form we need to provide
+ // translatability clues, otherwise the non-multilingual form elements
+ // should be hidden.
+ if (!$translation_form) {
+ if ($display_translatability_clue) {
+ $this->addTranslatabilityClue($element[$key]);
}
- // Elements are considered to be non multilingual by default.
- if (empty($element[$key]['#multilingual'])) {
- // If we are displaying a multilingual entity form we need to provide
- // translatability clues, otherwise the non-multilingual form elements
- // should be hidden.
- if (!$translation_form) {
- if ($display_translatability_clue) {
- $this->addTranslatabilityClue($element[$key]);
- }
- // Hide widgets for untranslatable fields.
- if ($hide_untranslatable_fields && isset($field_definitions[$key])) {
- $element[$key]['#access'] = FALSE;
- $display_warning = TRUE;
- }
- }
- else {
- $element[$key]['#access'] = FALSE;
- }
+ // Hide widgets for untranslatable fields.
+ if ($hide_untranslatable_fields && isset($field_definitions[$key])) {
+ $element[$key]['#access'] = FALSE;
+ $display_warning = TRUE;
}
}
+ else {
+ $element[$key]['#access'] = FALSE;
+ }
}
if ($display_warning && !$form_state->isSubmitted() && !$form_state->isRebuilding()) {
--
GitLab