M2C-22090 Translate Wishlist and Compare label in template

app/code/Magento/Catalog/CustomerData/CompareProducts.php

@@ -7,6 +7,9 @@
 
 use Magento\Customer\CustomerData\SectionSourceInterface;
 
+/**
+ * CompareProducts section
+ */
 class CompareProducts implements SectionSourceInterface
 {
     /**
@@ -40,20 +43,21 @@ public function __construct(
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getSectionData()
     {
         $count = $this->helper->getItemCount();
         return [
             'count' => $count,
-            'countCaption' => $count == 1 ? __('1 item') : __('%1 items', $count),
             'listUrl' => $this->helper->getListUrl(),
             'items' => $count ? $this->getItems() : [],
         ];
     }
 
     /**
+     * Get items in Compare List
+     *
      * @return array
      */
     protected function getItems()

app/code/Magento/Catalog/Test/Unit/CustomerData/CompareProductsTest.php

@@ -186,7 +186,6 @@ public function testGetSectionData()
         $this->assertEquals(
             [
                 'count' => $count,
-                'countCaption' =>  __('%1 items', $count),
                 'listUrl' => 'http://list.url',
                 'items' => [
                     [
@@ -231,7 +230,6 @@ public function testGetSectionDataNoItems()
         $this->assertEquals(
             [
                 'count' => $count,
-                'countCaption' =>  __('%1 items', $count),
                 'listUrl' => 'http://list.url',
                 'items' => []
             ],
@@ -269,7 +267,6 @@ public function testGetSectionDataSingleItem()
         $this->assertEquals(
             [
                 'count' => 1,
-                'countCaption' =>  __('1 item'),
                 'listUrl' => 'http://list.url',
                 'items' => [
                     [

app/code/Magento/Catalog/ViewModel/Product/Compare/Sidebar.php

@@ -0,0 +1,39 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Catalog\ViewModel\Product\Compare;
+
+use Magento\Catalog\Helper\Product\Compare as CompareHelper;
+use Magento\Framework\View\Element\Block\ArgumentInterface;
+
+/**
+ * ViewModel for Compare Product List
+ */
+class Sidebar implements ArgumentInterface
+{
+    /**
+     * @var CompareHelper
+     */
+    private $compareHelper;
+
+    /**
+     * @param CompareHelper $compareHelper
+     */
+    public function __construct(CompareHelper $compareHelper)
+    {
+        $this->compareHelper = $compareHelper;
+    }
+
+    /**
+     * Get parameters to clear compare list
+     *
+     * @return string
+     */
+    public function getClearCompareListParameters()
+    {
+        return $this->compareHelper->getPostDataClearList();
+    }
+}

app/code/Magento/Catalog/view/frontend/layout/default.xml

@@ -56,6 +56,7 @@
                             </item>
                         </item>
                     </argument>
+                    <argument name="compare_view_model" xsi:type="object">Magento\Catalog\ViewModel\Product\Compare\Sidebar</argument>
                 </arguments>
             </block>
         </referenceContainer>

app/code/Magento/Catalog/view/frontend/templates/product/compare/link.phtml

@@ -11,7 +11,17 @@
        data-bind="attr: {'href': compareProducts().listUrl}, css: {'no-display': !compareProducts().count}"
     >
         <?= $block->escapeHtml(__('Compare Products')) ?>
-        <span class="counter qty" data-bind="text: compareProducts().countCaption"></span>
+        <!-- ko if: compareProducts().count -->
+        <span class="counter qty">
+            <span data-bind="text: compareProducts().count"></span>
+            <!-- ko if: (compareProducts().count === 1) -->
+                <?= $block->escapeHtmlAttr(__(' item')) ?>
+            <!--/ko-->
+            <!-- ko if: (compareProducts().count > 1) -->
+                <?= $block->escapeHtmlAttr(__(' items')) ?>
+            <!--/ko-->
+        </span>
+        <!-- /ko -->
     </a>
 </li>
 <script type="text/x-magento-init">

app/code/Magento/Catalog/view/frontend/templates/product/compare/sidebar.phtml

@@ -5,16 +5,33 @@
  */
 
 // phpcs:disable Magento2.Templates.ThisInTemplate.FoundThis
-
-/* @var $block \Magento\Framework\View\Element\Template */
+?>
+<?php
+/** @var \Magento\Framework\View\Element\Template $block */
+/** @var \Magento\Catalog\ViewModel\Product\Compare\Sidebar $viewModel */
+$viewModel = $block->getData('compare_view_model');
 ?>
 <div class="block block-compare" data-bind="scope: 'compareProducts'" data-role="compare-products-sidebar">
     <div class="block-title">
-        <strong id="block-compare-heading" role="heading" aria-level="2"><?= $block->escapeHtml(__('Compare Products')) ?></strong>
-        <span class="counter qty no-display" data-bind="text: compareProducts().countCaption, css: {'no-display': !compareProducts().count}"></span>
+        <strong id="block-compare-heading" role="heading" aria-level="2">
+            <?= $block->escapeHtml(__('Compare Products')) ?>
+        </strong>
+        <!-- ko if: compareProducts().count -->
+        <span class="counter qty no-display" data-bind="css: {'no-display': !compareProducts().count}">
+            <span data-bind="text: compareProducts().count"></span>
+            <!-- ko if: (compareProducts().count === 1) -->
+                <?= $block->escapeHtmlAttr(__(' item')) ?>
+            <!--/ko-->
+            <!-- ko if: (compareProducts().count > 1) -->
+                <?= $block->escapeHtmlAttr(__(' items')) ?>
+            <!--/ko-->
+        </span>
+        <!-- /ko -->
     </div>
     <!-- ko if: compareProducts().count -->
-    <div class="block-content no-display" aria-labelledby="block-compare-heading" data-bind="css: {'no-display': !compareProducts().count}">
+    <div class="block-content no-display"
+         aria-labelledby="block-compare-heading"
+         data-bind="css: {'no-display': !compareProducts().count}">
         <ol id="compare-items" class="product-items product-items-names" data-bind="foreach: compareProducts().items">
                 <li class="product-item">
                     <input type="hidden" class="compare-item-id" data-bind="value: id"/>
@@ -31,12 +48,16 @@
         </ol>
         <div class="actions-toolbar">
             <div class="primary">
-                <a data-bind="attr: {'href': compareProducts().listUrl}" class="action compare primary"><span><?= $block->escapeHtml(__('Compare')) ?></span></a>
+                <a data-bind="attr: {'href': compareProducts().listUrl}"
+                   class="action compare primary">
+                   <span><?= $block->escapeHtml(__('Compare')) ?></span>
+                </a>
             </div>
             <div class="secondary">
-                <a id="compare-clear-all" href="#" class="action clear" data-post="<?=$block->escapeHtml(
-                    $this->helper(Magento\Catalog\Helper\Product\Compare::class)->getPostDataClearList()
-                ) ?>">
+                <a id="compare-clear-all"
+                   href="#"
+                   class="action clear"
+                   data-post="<?=$block->escapeHtml($viewModel->getClearCompareListParameters()) ?>">
                     <span><?= $block->escapeHtml(__('Clear All')) ?></span>
                 </a>
             </div>

app/code/Magento/Wishlist/Block/Customer/Sidebar.php

@@ -4,15 +4,14 @@
  * See COPYING.txt for license details.
  */
 
-/**
- * Wishlist sidebar block
- */
 namespace Magento\Wishlist\Block\Customer;
 
 use Magento\Catalog\Model\Product;
 use Magento\Framework\Pricing\Render;
 
 /**
+ * Wishlist Sidebar block
+ *
  * @api
  * @since 100.0.2
  */

app/code/Magento/Wishlist/CustomerData/Wishlist.php

@@ -68,7 +68,7 @@ public function __construct(
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getSectionData()
     {
@@ -80,27 +80,13 @@ public function getSectionData()
     }
 
     /**
+     * Get number of wishlist items
+     *
      * @return string
      */
     protected function getCounter()
     {
-        return $this->createCounter($this->wishlistHelper->getItemCount());
-    }
-
-    /**
-     * Create button label based on wishlist item quantity
-     *
-     * @param int $count
-     * @return \Magento\Framework\Phrase|null
-     */
-    protected function createCounter($count)
-    {
-        if ($count > 1) {
-            return __('%1 items', $count);
-        } elseif ($count == 1) {
-            return __('1 item');
-        }
-        return null;
+        return $this->wishlistHelper->getItemCount();
     }
 
     /**

app/code/Magento/Wishlist/Test/Unit/CustomerData/WishlistTest.php

@@ -97,7 +97,7 @@ public function testGetSectionData()
         $itemRemoveParams = ['remove_params'];
 
         $result = [
-            'counter' => __('1 item'),
+            'counter' => 1,
             'items' => [
                 [
                     'image' => [
@@ -286,7 +286,7 @@ public function testGetSectionDataWithTwoItems()
         $items = [$itemMock, $itemMock];
 
         $result = [
-            'counter' =>  __('%1 items', count($items)),
+            'counter' =>  2,
             'items' => [
                 [
                     'image' => [

app/code/Magento/Wishlist/ViewModel/Sidebar.php

@@ -0,0 +1,49 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Wishlist\ViewModel;
+
+use Magento\Wishlist\Helper\Data as WishlistHelper;
+use Magento\Framework\View\Element\Block\ArgumentInterface;
+
+/**
+ * ViewModel for Wishlist Url
+ */
+class Sidebar implements ArgumentInterface
+{
+    /**
+     * @var WishlistHelper
+     */
+    private $wishlistHelper;
+
+    /**
+     * @param WishlistHelper $wishlistHelper
+     */
+    public function __construct(WishlistHelper $wishlistHelper)
+    {
+        $this->wishlistHelper = $wishlistHelper;
+    }
+
+    /**
+     * Get Wishlist URL
+     *
+     * @return string
+     */
+    public function getWishlistUrl()
+    {
+        return $this->wishlistHelper->getListUrl();
+    }
+
+    /**
+     * Check whether the Wishlist is allowed
+     *
+     * @return bool
+     */
+    public function isWishlistAllowed()
+    {
+        return $this->wishlistHelper->isAllow();
+    }
+}

app/code/Magento/Wishlist/view/frontend/layout/default.xml

@@ -18,7 +18,11 @@
             </block>
         </referenceBlock>
         <referenceContainer name="sidebar.additional">
-            <block class="Magento\Wishlist\Block\Customer\Sidebar" name="wishlist_sidebar" as="wishlist" template="Magento_Wishlist::sidebar.phtml" ifconfig="wishlist/general/show_in_sidebar"/>
+            <block class="Magento\Wishlist\Block\Customer\Sidebar" name="wishlist_sidebar" as="wishlist" template="Magento_Wishlist::sidebar.phtml" ifconfig="wishlist/general/show_in_sidebar">
+                <arguments>
+                    <argument name="sidebar_view_model" xsi:type="object">Magento\Wishlist\ViewModel\Sidebar</argument>
+                </arguments>
+            </block>
         </referenceContainer>
     </body>
 </page>

app/code/Magento/Wishlist/view/frontend/templates/link.phtml

@@ -9,7 +9,15 @@
 <li class="link wishlist" data-bind="scope: 'wishlist'">
     <a <?= /* @noEscape */ $block->getLinkAttributes() ?>><?= $block->escapeHtml($block->getLabel()) ?>
         <!-- ko if: wishlist().counter -->
-        <span data-bind="text: wishlist().counter" class="counter qty"></span>
+        <span class="counter qty">
+            <span data-bind="text: wishlist().counter"></span>
+            <!-- ko if: (wishlist().counter === 1) -->
+                <?= $block->escapeHtmlAttr(__(' item')) ?>
+            <!--/ko-->
+            <!-- ko if: (wishlist().counter > 1) -->
+                <?= $block->escapeHtmlAttr(__(' items')) ?>
+            <!--/ko-->
+        </span>
         <!-- /ko -->
     </a>
 </li>