Skip to content

Commit 756dc8c

Browse files
author
Stanislav Idolov
authored
🔃 [EngCom] Public Pull Requests - 2.1-develop
Accepted Public Pull Requests: - #16720: [Backport] Fix for #12081: missing translations in the js-translations.json (by @sanganinamrata) - #16731: [Backport] Removed extra code (by @gelanivishal) - #16735: [backport] #16559 fix icon color variable naming (by @Karlasa) Fixed GitHub Issues: - #12081: Magento 2.2.0: Translations for 'Item in Cart' missing in mini cart. (reported by @jhruehl) has been fixed in #16720 by @sanganinamrata in 2.1-develop branch Related commits: 1. aa0e051
2 parents 2b53bf2 + 3496441 commit 756dc8c

File tree

5 files changed

+9
-10
lines changed

5 files changed

+9
-10
lines changed

app/code/Magento/Translation/etc/di.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,7 @@
6161
<item name="translate_wrapping" xsi:type="string"><![CDATA[~translate\=("')([^\'].*?)\'\"~]]></item>
6262
<item name="mage_translation_widget" xsi:type="string"><![CDATA[~(?:\$|jQuery)\.mage\.__\((?s)[^'"]*?(['"])(.+?)(?<!\\)\1(?s).*?\)~]]></item>
6363
<item name="mage_translation_static" xsi:type="string"><![CDATA[~\$t\((?s)[^'"]*?(["'])(.+?)\1(?s).*?\)~]]></item>
64+
<item name="translate_args" xsi:type="string"><![CDATA[~translate args\=("|'|"')([^\'].*?)('"|'|")~]]></item>
6465
</argument>
6566
</arguments>
6667
</type>

app/code/Magento/Ui/Model/Export/ConvertToCsv.php

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
use Magento\Framework\Exception\FileSystemException;
1010
use Magento\Framework\Exception\LocalizedException;
1111
use Magento\Framework\Filesystem;
12-
use Magento\Framework\Filesystem\Directory\WriteInterface;
1312
use Magento\Ui\Component\MassAction\Filter;
1413

1514
/**
@@ -18,7 +17,7 @@
1817
class ConvertToCsv
1918
{
2019
/**
21-
* @var WriteInterface
20+
* @var DirectoryList
2221
*/
2322
protected $directory;
2423

app/code/Magento/Ui/Model/Export/ConvertToXml.php

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
use Magento\Framework\Exception\FileSystemException;
1414
use Magento\Framework\Exception\LocalizedException;
1515
use Magento\Framework\Filesystem;
16-
use Magento\Framework\Filesystem\Directory\WriteInterface;
1716
use Magento\Ui\Component\MassAction\Filter;
1817

1918
/**
@@ -22,7 +21,7 @@
2221
class ConvertToXml
2322
{
2423
/**
25-
* @var WriteInterface
24+
* @var DirectoryList
2625
*/
2726
protected $directory;
2827

app/design/frontend/Magento/blank/Magento_CatalogSearch/web/css/source/_module.less

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,9 @@
3636
@_icon-font-content: @icon-search,
3737
@_icon-font-size: 35px,
3838
@_icon-font-line-height: 33px,
39-
@_icon-font-color: @minicart-icons-color,
40-
@_icon-font-color-hover: @minicart-icons-color-hover,
41-
@_icon-font-color-active: @minicart-icons-color-hover,
39+
@_icon-font-color: @header-icons-color,
40+
@_icon-font-color-hover: @header-icons-color-hover,
41+
@_icon-font-color-active: @header-icons-color-hover,
4242
@_icon-font-text-hide: true
4343
);
4444
display: inline-block;

app/design/frontend/Magento/luma/Magento_CatalogSearch/web/css/source/_module.less

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,9 @@
3737
@_icon-font-size: 22px,
3838
@_icon-font-line-height: 28px,
3939
@_icon-font-margin: 0 @indent__s 0 0,
40-
@_icon-font-color: @minicart-icons-color,
41-
@_icon-font-color-hover: @minicart-icons-color-hover,
42-
@_icon-font-color-active: @minicart-icons-color-hover,
40+
@_icon-font-color: @header-icons-color,
41+
@_icon-font-color-hover: @header-icons-color-hover,
42+
@_icon-font-color-active: @header-icons-color-hover,
4343
@_icon-font-text-hide: true
4444
);
4545
display: inline-block;

0 commit comments

Comments
 (0)