Skip to content

Commit e6e275b

Browse files
author
Joan He
authored
Merge pull request #1777 from magento-arcticfoxes/MAGETWO-84649-cloud-support-analytics-22
[arcticfoxes] MAGETWO-84650: Missing periods in Release Notification modal
2 parents 6862632 + 683d862 commit e6e275b

File tree

3 files changed

+30
-12
lines changed

3 files changed

+30
-12
lines changed

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

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -254,4 +254,22 @@
254254
<argument name="responseResolver" xsi:type="object">NotifyDataChangedResponseResolver</argument>
255255
</arguments>
256256
</type>
257+
<type name="Magento\Config\Model\Config\TypePool">
258+
<arguments>
259+
<argument name="sensitive" xsi:type="array">
260+
<item name="analytics/url/signup" xsi:type="string">1</item>
261+
<item name="analytics/url/update" xsi:type="string">1</item>
262+
<item name="analytics/url/bi_essentials" xsi:type="string">1</item>
263+
<item name="analytics/url/otp" xsi:type="string">1</item>
264+
<item name="analytics/url/report" xsi:type="string">1</item>
265+
<item name="analytics/url/notify_data_changed" xsi:type="string">1</item>
266+
<item name="analytics/general/token" xsi:type="string">1</item>
267+
</argument>
268+
<argument name="environment" xsi:type="array">
269+
<item name="crontab/default/jobs/analytics_collect_data/schedule/cron_expr" xsi:type="string">1</item>
270+
<item name="crontab/default/jobs/analytics_update/schedule/cron_expr" xsi:type="string">1</item>
271+
<item name="crontab/default/jobs/analytics_subscribe/schedule/cron_expr" xsi:type="string">1</item>
272+
</argument>
273+
</arguments>
274+
</type>
257275
</config>

app/code/Magento/ReleaseNotification/i18n/en_US.csv

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
payment and shipping information to skip tedious checkout steps.</p>
1616
</div>
1717
<div class=""email-marketing-highlight"">
18-
<h3>Email Marketing Automation</span></h3>
18+
<h3>Email Marketing Automation</h3>
1919
<p>Send smarter, faster email campaigns with marketing automation from dotmailer, powered by
2020
your Magento store's live data.</p>
2121
</div>
@@ -34,7 +34,7 @@
3434
payment and shipping information to skip tedious checkout steps.</p>
3535
</div>
3636
<div class=""email-marketing-highlight"">
37-
<h3>Email Marketing Automation</span></h3>
37+
<h3>Email Marketing Automation</h3>
3838
<p>Send smarter, faster email campaigns with marketing automation from dotmailer, powered by
3939
your Magento store's live data.</p>
4040
</div>
@@ -65,26 +65,26 @@
6565
features include:
6666
</p>
6767
<ul>
68-
<li><span>Configurable “Instant Purchase” button to place orders</span></li>
68+
<li><span>Configurable “Instant Purchase” button to place orders.</span></li>
6969
<li><span>Support for all payment solutions using Braintree Vault, including Braintree Credit
7070
Card, Braintree PayPal, and PayPal Payflow Pro.</span></li>
7171
<li><span>Shipping to the customer’s default address using the lowest cost, available shipping
72-
method</span></li>
72+
method.</span></li>
7373
<li><span>Ability for developers to customize the Instant Purchase business logic to meet
74-
merchant needs</span></li>
74+
merchant needs.</span></li>
7575
</ul>","<p>Now you can deliver an Amazon-like experience with a new, streamlined checkout option.
7676
Logged-in customers can use previously-stored payment credentials and shipping information
7777
to skip steps, making the process faster and easier, especially for mobile shoppers. Key
7878
features include:
7979
</p>
8080
<ul>
81-
<li><span>Configurable “Instant Purchase” button to place orders</span></li>
81+
<li><span>Configurable “Instant Purchase” button to place orders.</span></li>
8282
<li><span>Support for all payment solutions using Braintree Vault, including Braintree Credit
8383
Card, Braintree PayPal, and PayPal Payflow Pro.</span></li>
8484
<li><span>Shipping to the customer’s default address using the lowest cost, available shipping
85-
method</span></li>
85+
method.</span></li>
8686
<li><span>Ability for developers to customize the Instant Purchase business logic to meet
87-
merchant needs</span></li>
87+
merchant needs.</span></li>
8888
</ul>"
8989
"Email Marketing Automation","Email Marketing Automation"
9090
"<p>Unlock an unparalleled level of insight and control of your eCommerce marketing with

app/code/Magento/ReleaseNotification/view/adminhtml/ui_component/release_notification.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@
7373
payment and shipping information to skip tedious checkout steps.</p>
7474
</div>
7575
<div class="email-marketing-highlight">
76-
<h3>Email Marketing Automation</span></h3>
76+
<h3>Email Marketing Automation</h3>
7777
<p>Send smarter, faster email campaigns with marketing automation from dotmailer, powered by
7878
your Magento store's live data.</p>
7979
</div>
@@ -226,13 +226,13 @@
226226
features include:
227227
</p>
228228
<ul>
229-
<li><span>Configurable “Instant Purchase” button to place orders</span></li>
229+
<li><span>Configurable “Instant Purchase” button to place orders.</span></li>
230230
<li><span>Support for all payment solutions using Braintree Vault, including Braintree Credit
231231
Card, Braintree PayPal, and PayPal Payflow Pro.</span></li>
232232
<li><span>Shipping to the customer’s default address using the lowest cost, available shipping
233-
method</span></li>
233+
method.</span></li>
234234
<li><span>Ability for developers to customize the Instant Purchase business logic to meet
235-
merchant needs</span></li>
235+
merchant needs.</span></li>
236236
</ul>]]>
237237
</item>
238238
</item>

0 commit comments

Comments
 (0)