Verified Commit 871d7f1c authored by Dave Long's avatar Dave Long
Browse files

fix: #3547808 label_display block configuration value should not be translatable 

By: tstoeckler
By: borisson_
(cherry picked from commit b59cf672)
parent b5c30c32

core/config/schema/core.data_types.schema.yml

+6 −1
Original line number Diff line number Diff line
@@ -456,8 +456,13 @@ block_settings: 
      type: label

      label: 'Description'

    label_display:

      type: label

      type: string

      label: 'Display title'

      constraints:

        Choice:

          - '0'

          - visible

        NotBlank: []

    provider:

      type: string

      label: 'Provider of this block plugin'

core/lib/Drupal/Core/Block/Plugin/Block/PageTitleBlock.php

+1 −1
Original line number Diff line number Diff line
@@ -38,7 +38,7 @@ public function setTitle($title) { 
   * {@inheritdoc}

   */

  public function defaultConfiguration() {

    return ['label_display' => FALSE];

    return ['label_display' => '0'];

  }



  /**

core/lib/Drupal/Core/Menu/Plugin/Block/LocalActionsBlock.php

+1 −1
Original line number Diff line number Diff line
@@ -70,7 +70,7 @@ public static function create(ContainerInterface $container, array $configuratio 
   * {@inheritdoc}

   */

  public function defaultConfiguration() {

    return ['label_display' => FALSE];

    return ['label_display' => '0'];

  }



  /**

core/lib/Drupal/Core/Menu/Plugin/Block/LocalTasksBlock.php

+1 −1
Original line number Diff line number Diff line
@@ -75,7 +75,7 @@ public static function create(ContainerInterface $container, array $configuratio 
   */

  public function defaultConfiguration() {

    return [

      'label_display' => FALSE,

      'label_display' => '0',

      'primary' => TRUE,

      'secondary' => TRUE,

    ];

core/modules/block/tests/modules/block_test/config/install/block.block.test_block.yml

+1 −1
Original line number Diff line number Diff line
@@ -12,6 +12,6 @@ weight: 0 
plugin: test_html

settings:

  label: 'Test HTML block'

  label_display: hidden

  label_display: '0'

  provider: block_test

visibility: {  }