From 4400de6a9c479ae7a8822a1a49dc72ddbdd52c42 Mon Sep 17 00:00:00 2001
From: Bradley Brecher <bbrecher@somethingdigital.com>
Date: Sun, 18 Apr 2021 18:16:10 -0400
Subject: [PATCH 1/4] Add aria-label to page jump

---
 .../Magento/Theme/view/frontend/templates/html/pager.phtml  | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/app/code/Magento/Theme/view/frontend/templates/html/pager.phtml b/app/code/Magento/Theme/view/frontend/templates/html/pager.phtml
index 6b28dbd4521a0..7ac1486e6ae50 100644
--- a/app/code/Magento/Theme/view/frontend/templates/html/pager.phtml
+++ b/app/code/Magento/Theme/view/frontend/templates/html/pager.phtml
@@ -61,6 +61,7 @@
                 <li class="item">
                     <a class="page previous jump"
                        title=""
+                       aria-label="Skip to page <?= $block->escapeHtml($block->getPreviousJumpPage()) ?>"
                        href="<?= $block->escapeUrl($block->getPreviousJumpUrl()) ?>">
                         <span>...</span>
                     </a>
@@ -87,7 +88,10 @@
 
             <?php if ($block->canShowNextJump()): ?>
                 <li class="item">
-                    <a class="page next jump" title="" href="<?= $block->escapeUrl($block->getNextJumpUrl()) ?>">
+                    <a class="page next jump"
+                       title=""
+                       aria-label="Skip to page <?= $block->escapeHtml($block->getNextJumpPage()) ?>"
+                       href="<?= $block->escapeUrl($block->getNextJumpUrl()) ?>">
                         <span>...</span>
                     </a>
                 </li>

From 0430a80262c1595627260e4aca01510efe248a6e Mon Sep 17 00:00:00 2001
From: Bradley Brecher <bbrecher@somethingdigital.com>
Date: Thu, 27 May 2021 23:09:13 -0400
Subject: [PATCH 2/4] Add translation & escape verbiage

---
 .../Magento/Theme/view/frontend/templates/html/pager.phtml    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/code/Magento/Theme/view/frontend/templates/html/pager.phtml b/app/code/Magento/Theme/view/frontend/templates/html/pager.phtml
index 7ac1486e6ae50..a9864d70cda2e 100644
--- a/app/code/Magento/Theme/view/frontend/templates/html/pager.phtml
+++ b/app/code/Magento/Theme/view/frontend/templates/html/pager.phtml
@@ -61,7 +61,7 @@
                 <li class="item">
                     <a class="page previous jump"
                        title=""
-                       aria-label="Skip to page <?= $block->escapeHtml($block->getPreviousJumpPage()) ?>"
+                       aria-label="<?= $block->escapeHtml(__('Skip to page %1', $block->getNextJumpPage())) ?>"
                        href="<?= $block->escapeUrl($block->getPreviousJumpUrl()) ?>">
                         <span>...</span>
                     </a>
@@ -90,7 +90,7 @@
                 <li class="item">
                     <a class="page next jump"
                        title=""
-                       aria-label="Skip to page <?= $block->escapeHtml($block->getNextJumpPage()) ?>"
+                       aria-label="<?= $block->escapeHtml(__('Skip to page %1', $block->getNextJumpPage())) ?>"
                        href="<?= $block->escapeUrl($block->getNextJumpUrl()) ?>">
                         <span>...</span>
                     </a>

From 345758e0d7c2f2d6c3b03a31c20242e9ff545d7b Mon Sep 17 00:00:00 2001
From: Bradley Brecher <bbrecher@somethingdigital.com>
Date: Mon, 31 May 2021 19:48:07 -0400
Subject: [PATCH 3/4] Update escaping method and docblock

---
 .../Magento/Theme/view/frontend/templates/html/pager.phtml | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/app/code/Magento/Theme/view/frontend/templates/html/pager.phtml b/app/code/Magento/Theme/view/frontend/templates/html/pager.phtml
index a9864d70cda2e..7885545cadad1 100644
--- a/app/code/Magento/Theme/view/frontend/templates/html/pager.phtml
+++ b/app/code/Magento/Theme/view/frontend/templates/html/pager.phtml
@@ -7,7 +7,8 @@
 /**
  * Pager template
  *
- * @see \Magento\Theme\Block\Html\Pager
+ * @var \Magento\Theme\Block\Html\Pager $block
+ * @var \Magento\Framework\Escaper $escaper
  */
 ?>
 <?php if ($block->getCollection()->getSize()): ?>
@@ -61,7 +62,7 @@
                 <li class="item">
                     <a class="page previous jump"
                        title=""
-                       aria-label="<?= $block->escapeHtml(__('Skip to page %1', $block->getNextJumpPage())) ?>"
+                       aria-label="<?= $escaper->escapeHtmlAttr(__('Skip to page %1', $block->getNextJumpPage())) ?>"
                        href="<?= $block->escapeUrl($block->getPreviousJumpUrl()) ?>">
                         <span>...</span>
                     </a>
@@ -90,7 +91,7 @@
                 <li class="item">
                     <a class="page next jump"
                        title=""
-                       aria-label="<?= $block->escapeHtml(__('Skip to page %1', $block->getNextJumpPage())) ?>"
+                       aria-label="<?= $escaper->escapeHtmlAttr(__('Skip to page %1', $block->getNextJumpPage())) ?>"
                        href="<?= $block->escapeUrl($block->getNextJumpUrl()) ?>">
                         <span>...</span>
                     </a>

From b84bd72558c8a3a7b23b0880bfd0e6e7586001fe Mon Sep 17 00:00:00 2001
From: Denis Kopylov <dkopylov@magenius.team>
Date: Fri, 13 Aug 2021 12:53:50 +0300
Subject: [PATCH 4/4] Update previous jump label

---
 .../Theme/view/frontend/templates/html/pager.phtml     | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/app/code/Magento/Theme/view/frontend/templates/html/pager.phtml b/app/code/Magento/Theme/view/frontend/templates/html/pager.phtml
index 7885545cadad1..d18ebdedd9b3c 100644
--- a/app/code/Magento/Theme/view/frontend/templates/html/pager.phtml
+++ b/app/code/Magento/Theme/view/frontend/templates/html/pager.phtml
@@ -62,7 +62,10 @@
                 <li class="item">
                     <a class="page previous jump"
                        title=""
-                       aria-label="<?= $escaper->escapeHtmlAttr(__('Skip to page %1', $block->getNextJumpPage())) ?>"
+                       aria-label="<?= $escaper->escapeHtmlAttr(__(
+                           'Skip to page %1',
+                           $block->getPreviousJumpPage()
+                       )) ?>"
                        href="<?= $block->escapeUrl($block->getPreviousJumpUrl()) ?>">
                         <span>...</span>
                     </a>
@@ -91,7 +94,10 @@
                 <li class="item">
                     <a class="page next jump"
                        title=""
-                       aria-label="<?= $escaper->escapeHtmlAttr(__('Skip to page %1', $block->getNextJumpPage())) ?>"
+                       aria-label="<?= $escaper->escapeHtmlAttr(__(
+                           'Skip to page %1',
+                           $block->getNextJumpPage()
+                       )) ?>"
                        href="<?= $block->escapeUrl($block->getNextJumpUrl()) ?>">
                         <span>...</span>
                     </a>