Skip to content

Commit

Permalink
Cherry pick 39327 into release/8.0 (#39387)
Browse files Browse the repository at this point in the history 
* Update/39325 typo in core profiler data sharing copy (#39327)

* Fix grammar in data-sharing agreement copy

* Add changelog

* Put ,

* Add brackets

* Move learn more link inside the bracket

* Update test snapshot

* Fix grammar

* Update test snapshot

* Prep for cherry pick 39327

---------

Co-authored-by: Moon <moon.kyong@automattic.com>
Co-authored-by: WooCommerce Bot <no-reply@woocommerce.com>
  • Loading branch information
@github-actions @moon0326
3 people committed Jul 24, 2023
1 parent a1e6abc commit 91917ca
Show file tree
Hide file tree
Showing 3 changed files with 20 additions and 19 deletions.
2 changes: 1 addition & 1 deletion plugins/woocommerce-admin/client/core-profiler/pages/IntroOptIn.tsx
View file
Expand Up @@ -72,7 +72,7 @@ export const IntroOptIn = ( {
className="core-profiler__checkbox"
label={ interpolateComponents( {
mixedString: __(
'I agree to share my data to tailor my store setup experience and get more relevant content. WooCommerce never rent or sell your data and you can opt out at any time in WooCommerce settings. {{link}}Learn more about usage tracking{{/link}}.',
'I agree to share my data to tailor my store setup experience and get more relevant content (WooCommerce will never rent or sell your data, and you can opt out at any time in WooCommerce settings. {{link}}Learn more about usage tracking.{{/link}})',
'woocommerce'
),
components: {
Expand Down
36 changes: 18 additions & 18 deletions ...ommerce-admin/client/core-profiler/test/__snapshots__/core-profiler-machine.test.tsx.snap
View file
Expand Up @@ -451,15 +451,15 @@ Object {
class="components-checkbox-control__label"
for="inspector-checkbox-control-1"
>
I agree to share my data to tailor my store setup experience and get more relevant content. WooCommerce never rent or sell your data and you can opt out at any time in WooCommerce settings.
I agree to share my data to tailor my store setup experience and get more relevant content (WooCommerce will never rent or sell your data, and you can opt out at any time in WooCommerce settings.
<a
data-link-type="external"
href="https://woocommerce.com/usage-tracking?utm_medium=product"
target="_blank"
>
Learn more about usage tracking
Learn more about usage tracking.
</a>
.
)
</label>
</div>
</div>
Expand Down Expand Up @@ -596,15 +596,15 @@ Object {
class="components-checkbox-control__label"
for="inspector-checkbox-control-1"
>
I agree to share my data to tailor my store setup experience and get more relevant content. WooCommerce never rent or sell your data and you can opt out at any time in WooCommerce settings.
I agree to share my data to tailor my store setup experience and get more relevant content (WooCommerce will never rent or sell your data, and you can opt out at any time in WooCommerce settings.
<a
data-link-type="external"
href="https://woocommerce.com/usage-tracking?utm_medium=product"
target="_blank"
>
Learn more about usage tracking
Learn more about usage tracking.
</a>
.
)
</label>
</div>
</div>
Expand Down Expand Up @@ -971,15 +971,15 @@ Object {
class="components-checkbox-control__label"
for="inspector-checkbox-control-3"
>
I agree to share my data to tailor my store setup experience and get more relevant content. WooCommerce never rent or sell your data and you can opt out at any time in WooCommerce settings.
I agree to share my data to tailor my store setup experience and get more relevant content (WooCommerce will never rent or sell your data, and you can opt out at any time in WooCommerce settings.
<a
data-link-type="external"
href="https://woocommerce.com/usage-tracking?utm_medium=product"
target="_blank"
>
Learn more about usage tracking
Learn more about usage tracking.
</a>
.
)
</label>
</div>
</div>
Expand Down Expand Up @@ -1116,15 +1116,15 @@ Object {
class="components-checkbox-control__label"
for="inspector-checkbox-control-3"
>
I agree to share my data to tailor my store setup experience and get more relevant content. WooCommerce never rent or sell your data and you can opt out at any time in WooCommerce settings.
I agree to share my data to tailor my store setup experience and get more relevant content (WooCommerce will never rent or sell your data, and you can opt out at any time in WooCommerce settings.
<a
data-link-type="external"
href="https://woocommerce.com/usage-tracking?utm_medium=product"
target="_blank"
>
Learn more about usage tracking
Learn more about usage tracking.
</a>
.
)
</label>
</div>
</div>
Expand Down Expand Up @@ -1878,15 +1878,15 @@ Object {
class="components-checkbox-control__label"
for="inspector-checkbox-control-2"
>
I agree to share my data to tailor my store setup experience and get more relevant content. WooCommerce never rent or sell your data and you can opt out at any time in WooCommerce settings.
I agree to share my data to tailor my store setup experience and get more relevant content (WooCommerce will never rent or sell your data, and you can opt out at any time in WooCommerce settings.
<a
data-link-type="external"
href="https://woocommerce.com/usage-tracking?utm_medium=product"
target="_blank"
>
Learn more about usage tracking
Learn more about usage tracking.
</a>
.
)
</label>
</div>
</div>
Expand Down Expand Up @@ -2023,15 +2023,15 @@ Object {
class="components-checkbox-control__label"
for="inspector-checkbox-control-2"
>
I agree to share my data to tailor my store setup experience and get more relevant content. WooCommerce never rent or sell your data and you can opt out at any time in WooCommerce settings.
I agree to share my data to tailor my store setup experience and get more relevant content (WooCommerce will never rent or sell your data, and you can opt out at any time in WooCommerce settings.
<a
data-link-type="external"
href="https://woocommerce.com/usage-tracking?utm_medium=product"
target="_blank"
>
Learn more about usage tracking
Learn more about usage tracking.
</a>
.
)
</label>
</div>
</div>
Expand Down
1 change: 1 addition & 0 deletions plugins/woocommerce/readme.txt
View file
Expand Up @@ -203,6 +203,7 @@ WooCommerce comes with some sample data you can use to see how products look; im
* Add - Register woocommerce/product-variations-fields block [[#39038]](https://github.com/woocommerce/woocommerce/pull/39038)
* Add - Removed Avalara from Tax task list item [[#39238]](https://github.com/woocommerce/woocommerce/pull/39238)
* Add - Show create campaign button when there are campaign types in marketing page. [[#38825]](https://github.com/woocommerce/woocommerce/pull/38825)
* Update - Fix grammar in data-sharing agreement copy [#39327](https://github.com/woocommerce/woocommerce/pull/39327)
* Update - Update WooCommerce Blocks to 10.6.1 [#39299](https://github.com/woocommerce/woocommerce/pull/39299)
* Update - Add Klaviyo into onboarding marketing task list. [[#39087]](https://github.com/woocommerce/woocommerce/pull/39087)
* Update - Analytics API: A new filter_empty parameter that allows to remove from result customers with given empty fields [[#38827]](https://github.com/woocommerce/woocommerce/pull/38827)
Expand Down

0 comments on commit 91917ca

Please sign in to comment.