Verified Commit 45cb9fed authored by Alex Pott's avatar Alex Pott
Browse files

Issue #3444512 by neclimdul, alexpott, smustgrave: Pager current page announced twice 

(cherry picked from commit 3a54db4a)
parent 68715a6e

core/modules/system/templates/pager.html.twig

+1 −1
Original line number Diff line number Diff line
@@ -69,7 +69,7 @@ 
          {% endif %}

          <a href="{{ item.href }}" title="{{ title }}"{{ item.attributes|without('href', 'title') }}>

            <span class="visually-hidden">

              {{ current == key ? 'Current page'|t : 'Page'|t }}

              {{ 'Page'|t }}

            </span>

            {{- key -}}

          </a>

core/modules/views/tests/src/Functional/Plugin/PagerTest.php

+4 −1
Original line number Diff line number Diff line
@@ -373,7 +373,10 @@ public function testNormalPager() { 
    $view->display_handler->setOption('pager', $pager);

    $view->save();

    $this->drupalGet('test_pager_full', ['query' => ['page' => 2]]);

    $this->assertEquals('Current page 3', $this->assertSession()->elementExists('css', '.pager__items li.is-active')->getText());

    $this->assertEquals('Page 3', $this->assertSession()->elementExists('css', '.pager__items li.is-active')->getText());

    $link = $this->assertSession()->elementExists('css', '.pager__items li.is-active a');

    $this->assertSame('page', $link->getAttribute('aria-current'));

    $this->assertSame('Current page', $link->getAttribute('title'));

  }



  /**

core/themes/claro/templates/pager.html.twig

+1 −1
Original line number Diff line number Diff line
@@ -83,7 +83,7 @@ 
          {% endif %}

          <a href="{{ item.href }}" title="{{ title }}"{{ item.attributes|without('href', 'title').addClass(['pager__link', current == key ? ' is-active']) }}>

            <span class="visually-hidden">

              {{ current == key ? 'Current page'|t : 'Page'|t }}

              {{ 'Page'|t }}

            </span>

            {{ key }}

          </a>

core/themes/olivero/templates/navigation/pager.html.twig

+1 −1
Original line number Diff line number Diff line
@@ -77,7 +77,7 @@ 
              <a href="{{ item.href }}" title="{{ title }}"{{ item.attributes|without('href', 'title').addClass('pager__link', current == key ? ' is-active') }}>

            {% endif %}

            <span class="visually-hidden">

              {{ current == key ? 'Current page'|t : 'Page'|t }}

              {{ 'Page'|t }}

            </span>

            {{ key }}

            {% if current != key %}

core/themes/stable9/templates/navigation/pager.html.twig

+1 −1
Original line number Diff line number Diff line
@@ -67,7 +67,7 @@ 
          {% endif %}

          <a href="{{ item.href }}" title="{{ title }}"{{ item.attributes|without('href', 'title') }}>

            <span class="visually-hidden">

              {{ current == key ? 'Current page'|t : 'Page'|t }}

              {{ 'Page'|t }}

            </span>

            {{- key -}}

          </a>