Verified Commit b0d31368 authored by Dave Long's avatar Dave Long
Browse files

fix: #3046985 The word "Second" needs translation context 

By: jhodgdon
By: berdir
By: hexabinaer
By: sanduhrs
By: rpayanm
By: joachim namyslo
By: m-schmitt
(cherry picked from commit c8e47315)
parent 676003e7

core/lib/Drupal/Core/Datetime/Element/Datelist.php

+1 −1
Changes for core/lib/Drupal/Core/Datetime/Element/Datelist.php: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -232,7 +232,7 @@ public static function processDatelist(&$element, FormStateInterface $form_state 
        case 'second':

          $format = 's';

          $options = $date_helper->seconds($format, $element['#required'], $element['#date_increment']);

          $title = t('Second');

          $title = t('Second', [], ['context' => 'PHP date format']);

          break;



        case 'ampm':

core/modules/layout_builder/layout_builder.layouts.yml

+9 −0
Changes for core/modules/layout_builder/layout_builder.layouts.yml: 9 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -11,8 +11,10 @@ layout_twocol_section: 
  regions:

    first:

      label: First

      translation context: 'Layout region'

    second:

      label: Second

      translation context: 'Layout region'



layout_threecol_section:

  label: 'Three column'
@@ -27,10 +29,13 @@ layout_threecol_section: 
  regions:

    first:

      label: First

      translation context: 'Layout region'

    second:

      label: Second

      translation context: 'Layout region'

    third:

      label: Third

      translation context: 'Layout region'



layout_fourcol_section:

  label: 'Four column'
@@ -44,9 +49,13 @@ layout_fourcol_section: 
  regions:

    first:

      label: First

      translation context: 'Layout region'

    second:

      label: Second

      translation context: 'Layout region'

    third:

      label: Third

      translation context: 'Layout region'

    fourth:

      label: Fourth

      translation context: 'Layout region'

core/modules/layout_discovery/layout_discovery.layouts.yml

+8 −0
Changes for core/modules/layout_discovery/layout_discovery.layouts.yml: 8 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -27,8 +27,10 @@ layout_twocol: 
      label: Top

    first:

      label: First

      translation context: 'Layout region'

    second:

      label: Second

      translation context: 'Layout region'

    bottom:

      label: Bottom
@@ -77,10 +79,13 @@ layout_threecol_25_50_25: 
      label: Top

    first:

      label: First

      translation context: 'Layout region'

    second:

      label: Second

      translation context: 'Layout region'

    third:

      label: Third

      translation context: 'Layout region'

    bottom:

      label: Bottom
@@ -100,9 +105,12 @@ layout_threecol_33_34_33: 
      label: Top

    first:

      label: First

      translation context: 'Layout region'

    second:

      label: Second

      translation context: 'Layout region'

    third:

      label: Third

      translation context: 'Layout region'

    bottom:

      label: Bottom

core/modules/views/src/Plugin/views/sort/Date.php

+1 −1
Changes for core/modules/views/src/Plugin/views/sort/Date.php: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -35,7 +35,7 @@ public function buildOptionsForm(&$form, FormStateInterface $form_state) { 
      '#type' => 'radios',

      '#title' => $this->t('Granularity'),

      '#options' => [

        'second' => $this->t('Second'),

        'second' => $this->t('Second', [], ['context' => 'PHP date format']),

        'minute' => $this->t('Minute'),

        'hour'   => $this->t('Hour'),

        'day'    => $this->t('Day'),

core/profiles/demo_umami/themes/umami/umami.layouts.yml

+5 −0
Changes for core/profiles/demo_umami/themes/umami/umami.layouts.yml: 5 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -11,11 +11,16 @@ layout_oneplusfourgrid_section: 
  regions:

    first:

      label: First

      translation context: 'Layout region'

    second:

      label: Second

      translation context: 'Layout region'

    third:

      label: Third

      translation context: 'Layout region'

    fourth:

      label: Fourth

      translation context: 'Layout region'

    fifth:

      label: Fifth

      translation context: 'Layout region'