Skip to content
Snippets Groups Projects
Commit a33ebeda authored by Beerend Lauwers's avatar Beerend Lauwers Committed by Thomas Secher
Browse files

Issue #3360654 by beerendlauwers: Drupal 10 support

parent aa204e5d
No related branches found
No related tags found
1 merge request!1Issue #3360654 by beerendlauwers: Drupal 10 support
......@@ -2,7 +2,7 @@ name: 'Form Helper'
type: module
description: 'Add help text in forms'
core: 8.x
core_version_requirement: ^8 || ^9
core_version_requirement: ^8 || ^9 || ^10
package: 'Fields'
dependencies:
- drupal:field
......
......@@ -39,7 +39,7 @@ class FormHelperFieldGroup extends FieldGroupFormatterBase {
*
* @var string
*/
protected static $defaultTextFormat;
protected static string $defaultTextFormat;
/**
* REturn the current language code.
......@@ -72,7 +72,7 @@ class FormHelperFieldGroup extends FieldGroupFormatterBase {
0 => [
'#prefix' => '<h2>',
'#suffix' => '</h2>',
'#markup' => isset($settings[static::FIELD_TITLE]) ? $settings[static::FIELD_TITLE] : '',
'#markup' => $settings[static::FIELD_TITLE] ?? '',
],
1 => [
'#type' => 'processed_text',
......@@ -119,18 +119,18 @@ class FormHelperFieldGroup extends FieldGroupFormatterBase {
'#tree' => TRUE,
static::FIELD_TITLE => [
'#type' => 'hidden',
'#default_value' => isset($settings[static::FIELD_TITLE]) ? $settings[static::FIELD_TITLE] : '',
'#default_value' => $settings[static::FIELD_TITLE] ?? '',
],
static::FIELD_DESCRIPTION => [
'#type' => 'container',
'#tree' => TRUE,
'value' => [
'#type' => 'hidden',
'#default_value' => isset($settings[static::FIELD_DESCRIPTION]['value']) ? $settings[static::FIELD_DESCRIPTION]['value'] : '',
'#default_value' => $settings[static::FIELD_DESCRIPTION]['value'] ?? '',
],
'format' => [
'#type' => 'hidden',
'#default_value' => isset($settings[static::FIELD_DESCRIPTION]['format']) ? $settings[static::FIELD_DESCRIPTION]['format'] : '',
'#default_value' => $settings[static::FIELD_DESCRIPTION]['format'] ?? '',
],
],
];
......@@ -141,7 +141,7 @@ class FormHelperFieldGroup extends FieldGroupFormatterBase {
$form[$lang][static::FIELD_TITLE] = [
'#type' => 'textfield',
'#title' => $this->t('Title'),
'#default_value' => isset($settings[static::FIELD_TITLE]) ? $settings[static::FIELD_TITLE] : '',
'#default_value' => $settings[static::FIELD_TITLE] ?? '',
'#required' => TRUE,
];
......@@ -162,7 +162,7 @@ class FormHelperFieldGroup extends FieldGroupFormatterBase {
public function settingsSummary() {
$settings = $this->getLocalSettings();
$summary = [];
$summary[] = isset($settings[static::FIELD_TITLE]) ? $settings[static::FIELD_TITLE] : '';
$summary[] = $settings[static::FIELD_TITLE] ?? '';
return $summary;
}
......@@ -175,31 +175,31 @@ class FormHelperFieldGroup extends FieldGroupFormatterBase {
*/
public function getLocalSettings(): array {
$lang = static::getCurrentLanguage();
$languagedSettings = $this->getSetting($lang);
$languaged_settings = $this->getSetting($lang);
// If languaged settings exists.
if (!empty($languagedSettings[static::FIELD_TITLE])) {
return $languagedSettings;
if (!empty($languaged_settings[static::FIELD_TITLE])) {
return $languaged_settings;
}
// If cascade translation exists.
$languagesList = static::getLanguages();
$languagesCodes = array_keys($languagesList);
$languagesCodes = array_slice($languagesCodes, 0, array_search($lang, $languagesCodes));
$languagesCodes = array_reverse($languagesCodes);
$languages_list = static::getLanguages();
$languages_codes = array_keys($languages_list);
$languages_codes = array_slice($languages_codes, 0, array_search($lang, $languages_codes));
$languages_codes = array_reverse($languages_codes);
// Foreach language.
foreach ($languagesCodes as $langCode) {
$languagedSettings = $this->getSetting($langCode);
if (!empty($languagedSettings[static::FIELD_TITLE])) {
return $languagedSettings;
foreach ($languages_codes as $lang_code) {
$languaged_settings = $this->getSetting($lang_code);
if (!empty($languaged_settings[static::FIELD_TITLE])) {
return $languaged_settings;
}
}
// If untranslated element exists.
$languagedSettings = $this->getSettings();
if (!empty($languagedSettings[static::FIELD_TITLE])) {
return $languagedSettings;
$languaged_settings = $this->getSettings();
if (!empty($languaged_settings[static::FIELD_TITLE])) {
return $languaged_settings;
}
return [
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment