Merge 6c52d50 into 8f829b6

modules/hdbt_admin_tools/hdbt_admin_tools.module

@@ -21,6 +21,7 @@ use Drupal\hdbt_admin_tools\Plugin\Field\FieldType\SelectIcon;
 use Drupal\helfi_api_base\Link\UrlHelper;
 use Drupal\helfi_tpr\Entity\Service;
 use Drupal\node\NodeInterface;
+use Drupal\paragraphs\Entity\ParagraphsType;
 use Drupal\user\UserInterface;
 
 /**
@@ -894,6 +895,38 @@ function hdbt_admin_tools_preprocess_links__dropbutton__operations__paragraphs(&
   }
 }
 
+/**
+ * Implements hook_preprocess_HOOK().
+ */
+function hdbt_admin_tools_preprocess_input__submit__paragraph_action(array &$variables): void {
+
+  // According to UX team it's better to show the "Add @type" buttons without
+  // the Add word. Fix the texts from these buttons.
+  $add_paragraph_button = [
+    'field_content_0_subform_field_accordion_items_accordion_item_add_more',
+  ];
+
+  if (
+    !isset($variables['element']['#name']) ||
+    !in_array($variables['element']['#name'], $add_paragraph_button)
+  ) {
+    return;
+  }
+
+  // Get the label from the paragraph type and change the button label to
+  // match the label of the paragraph type.
+  $paragraph_storage = \Drupal::entityTypeManager()->getStorage('paragraphs_type');
+  $paragraph_type = $paragraph_storage->load($variables['element']['#bundle_machine_name']);
+
+  if (!$paragraph_type instanceof ParagraphsType) {
+    return;
+  }
+
+  $variables['attributes']['value'] = t('@type', [
+    '@type' => $paragraph_type->get('label'),
+  ]);
+}
+
 /**
  * Implements hook_form_alter().
  */

modules/helfi_paragraphs_accordion/config/install/field.field.paragraph.accordion.field_accordion_heading_level.yml

@@ -10,13 +10,13 @@ id: paragraph.accordion.field_accordion_heading_level
 field_name: field_accordion_heading_level
 entity_type: paragraph
 bundle: accordion
-label: 'Items heading level'
-description: 'Select the heading level of the accordion so that they are semantically correct with the rest of the content.'
+label: 'Accordion item title level'
+description: "If the accordion has a title, the level for accordion item titles should be one level lower. If the accordion doesn't have a title, the level of the accordion title will be used for accordion item titles."
 required: true
 translatable: false
 default_value:
   -
-    value: '2'
+    value: '3'
 default_value_callback: ''
 settings: {  }
 field_type: list_string

modules/helfi_paragraphs_accordion/config/install/field.field.paragraph.accordion.field_accordion_title.yml

@@ -8,7 +8,7 @@ id: paragraph.accordion.field_accordion_title
 field_name: field_accordion_title
 entity_type: paragraph
 bundle: accordion
-label: Title
+label: 'Accordion title'
 description: ''
 required: false
 translatable: false

modules/helfi_paragraphs_accordion/config/install/field.field.paragraph.accordion.field_accordion_title_level.yml

@@ -11,7 +11,7 @@ field_name: field_accordion_title_level
 entity_type: paragraph
 bundle: accordion
 label: 'Accordion title level'
-description: 'Select the title level of the accordion so that they are semantically correct with the rest of the content.'
+description: 'Choose the appropriate level for the accordion title in the page title hierarchy. Typically, the accordion title level is H2.'
 required: true
 translatable: false
 default_value:

modules/helfi_paragraphs_accordion/config/optional/language/fi/field.field.paragraph.accordion.field_accordion_heading_level.yml

@@ -1,2 +1,2 @@
-label: 'Sisällön pääotsikoiden taso'
-description: 'Valitse sisällön pääotsikoiden taso siten että ne ovat semanttisesti oikealla tasolla muun sisällön suhteen.'
+label: 'Haitarikohtien otsikkojen taso'
+description: 'Jos haitarilla on otsikko, pitää haitarikohtien otsikkojen tason olla yhtä tasoa alempana. Jos haitarilla ei ole otsikkoa, käyttää Drupal haitarikohtien otsikkotasona haitarin otsikon tasoa.'

modules/helfi_paragraphs_accordion/config/optional/language/fi/field.field.paragraph.accordion.field_accordion_title.yml

@@ -1 +1 @@
-label: Otsikko
+label: 'Haitarin otsikko'

modules/helfi_paragraphs_accordion/config/optional/language/fi/field.field.paragraph.accordion.field_accordion_title_level.yml

@@ -1,2 +1,2 @@
 label: 'Haitarin otsikon taso'
-description: 'Valitse haitarin otsikon taso niin, että se on semanttisesti oikein muun sisällön kanssa.'
+description: 'Valitse haitarin otsikolle sivun otsikkohierarkiaan sopiva taso. Yleensä haitarin otsikon taso on H2.'

modules/helfi_paragraphs_accordion/config/optional/language/fi/paragraphs.paragraphs_type.accordion_item.yml

@@ -1,2 +1,2 @@
-label: 'Haitarin sisältökohta'
+label: Haitarikohta
 description: 'Yksittäinen haitarin sisältökohta, jossa on otsikko ja sisältö.'

modules/helfi_paragraphs_accordion/helfi_paragraphs_accordion.install

@@ -8,9 +8,9 @@
 declare(strict_types=1);
 
 /**
- * UHF-8135 Update accordion paragraph translations.
+ * UHF-8835 Update accordion paragraph translations.
  */
-function helfi_paragraphs_accordion_update_9001(): void {
+function helfi_paragraphs_accordion_update_9002(): void {
   \Drupal::service('helfi_platform_config.config_update_helper')
     ->update('helfi_paragraphs_accordion');
 }