🔃 [EngCom] Public Pull Requests - 2.2-develop

Accepted Public Pull Requests: - magento#14504: Check if store id is not null instead of empty (by @quisse) - magento#14498: fix translation issue with rating stars (by @Karlasa)
sreichel · Apr 4, 2018 · fbd4188 · fbd4188
2 parents c35ee13 + 975a94a
commit fbd4188
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/app/code/Magento/Cms/Model/PageRepository.php b/app/code/Magento/Cms/Model/PageRepository.php
@@ -110,7 +110,7 @@ public function __construct(
      */
     public function save(\Magento\Cms\Api\Data\PageInterface $page)
     {
-        if (empty($page->getStoreId())) {
+        if ($page->getStoreId() === null) {
             $storeId = $this->storeManager->getStore()->getId();
             $page->setStoreId($storeId);
         }

diff --git a/app/code/Magento/Review/i18n/en_US.csv b/app/code/Magento/Review/i18n/en_US.csv
@@ -133,3 +133,5 @@ Summary,Summary
 Active,Active
 Inactive,Inactive
 "Please select one of each of the ratings above.","Please select one of each of the ratings above."
+star,star
+stars,stars
diff --git a/app/code/Magento/Review/view/frontend/templates/form.phtml b/app/code/Magento/Review/view/frontend/templates/form.phtml
@@ -40,9 +40,9 @@
                                 <label
                                     class="rating-<?= $block->escapeHtmlAttr($iterator) ?>"
                                     for="<?= $block->escapeHtmlAttr(str_replace(' ', '_', $_rating->getRatingCode())) ?>_<?= $block->escapeHtmlAttr($_option->getValue()) ?>"
-                                    title="<?= $block->escapeHtmlAttr(__('%1 %2', $iterator, $iterator > 1 ? 'stars' : 'star')) ?>"
+                                    title="<?= $block->escapeHtmlAttr(__('%1 %2', $iterator, $iterator > 1 ? __('stars') : __('star'))) ?>"
                                     id="<?= $block->escapeHtmlAttr(str_replace(' ', '_', $_rating->getRatingCode())) ?>_<?= $block->escapeHtmlAttr($_option->getValue()) ?>_label">
-                                    <span><?= $block->escapeHtml(__('%1 %2', $iterator, $iterator > 1 ? 'stars' : 'star')) ?></span>
+                                    <span><?= $block->escapeHtml(__('%1 %2', $iterator, $iterator > 1 ? __('stars') : __('star'))) ?></span>
                                 </label>
                             <?php $iterator++; ?>
                             <?php endforeach; ?>