From e34d260da68af46b0aad8b1635386c7159bf9b50 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miguel=20P=C3=A9rez=20Pellicer?= <5908855+puntope@users.noreply.github.com> Date: Mon, 20 May 2024 12:40:17 +0400 Subject: [PATCH 1/9] Rename Google for WooCommerce --- .github/CONTRIBUTING.md | 6 +++--- README.md | 4 ++-- changelog.txt | 10 +++++----- docs/gtag-consent-mode.md | 4 ++-- google-listings-and-ads.php | 2 +- js/src/get-started-page/benefits-card/index.js | 2 +- js/src/get-started-page/faqs/index.js | 4 ++-- js/src/get-started-page/features-card/index.js | 2 +- .../get-started-page/get-started-card/index.js | 2 +- .../unsupported-notices/index.js | 4 ++-- js/src/index.js | 2 +- js/src/index.test.js | 2 +- js/src/product-feed/index.js | 4 ++-- js/src/product-feed/index.test.js | 4 ++-- .../submission-success-guide/index.js | 2 +- .../setup-stepper/setup-accounts/index.js | 4 ++-- js/src/setup-mc/top-bar/index.js | 2 +- package.json | 4 ++-- readme.txt | 18 +++++++++--------- src/API/Google/AdsConversionAction.php | 4 ++-- src/Admin/Admin.php | 2 +- src/Admin/Product/Attributes/AttributesTab.php | 4 ++-- .../Product/Attributes/AttributesTrait.php | 2 +- src/Admin/ProductBlocksService.php | 2 +- src/Autoloader.php | 4 ++-- src/ConnectionTest.php | 2 +- src/Container.php | 2 +- .../ExtensionRequirementException.php | 4 ++-- src/Exception/InvalidVersion.php | 6 +++--- src/Google/GlobalSiteTag.php | 2 +- src/Google/SiteVerificationMeta.php | 2 +- .../ThirdPartyServiceProvider.php | 2 +- src/Menu/Dashboard.php | 6 +++--- src/Menu/GetStarted.php | 6 +++--- src/MultichannelMarketing/GLAChannel.php | 2 +- src/Notes/CompleteSetup.php | 2 +- src/Notes/ReconnectWordPress.php | 6 +++--- src/Notes/ReviewAfterClicks.php | 2 +- src/Notes/ReviewAfterConversions.php | 2 +- .../DBShippingSettingsAdapter.php | 2 +- .../WCShippingSettingsAdapter.php | 2 +- src/TaskList/CompleteSetupTask.php | 2 +- src/Tracking/EventTracking.php | 2 +- src/Tracking/README.md | 4 ++-- src/Tracking/TrackerSnapshot.php | 2 +- src/Tracking/Tracks.php | 2 +- src/Tracking/TracksInterface.php | 2 +- .../API/Google/AdsConversionActionTest.php | 2 +- tests/Unit/Admin/ProductBlocksServiceTest.php | 4 ++-- tests/Unit/TaskList/CompleteSetupTaskTest.php | 2 +- tests/e2e/bin/test-env-setup.sh | 2 +- tests/e2e/specs/get-started.test.js | 6 +++--- .../product-editor/classic-integration.test.js | 2 +- .../e2e/specs/setup-mc/step-1-accounts.test.js | 2 +- .../setup-mc/step-4-complete-campaign.test.js | 6 +++--- tests/e2e/utils/product-editor.js | 4 ++-- uninstall.php | 4 ++-- views/attributes/tab-panel.php | 2 +- views/attributes/variations-form.php | 2 +- views/meta-box/channel_visibility.php | 4 ++-- views/meta-box/coupon_channel_visibility.php | 4 ++-- 61 files changed, 105 insertions(+), 105 deletions(-) diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index b44ef573a7..f1c36a3598 100644 --- a/.github/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -1,14 +1,14 @@ # Contributing -Thanks for your interest in contributing to Google Listings and Ads! +Thanks for your interest in contributing to Google for WooCommerce! ## Guidelines Like the WooCommerce project, we want to ensure a welcoming environment for everyone. With that in mind, all contributors are expected to follow our [Code of Conduct](./CODE_OF_CONDUCT.md). -If you wish to contribute code, please read the information in the sections below. Then [fork](https://help.github.com/articles/fork-a-repo/) Google Listings and Ads, commit your changes, and [submit a pull request](https://docs.github.com/en/github/collaborating-with-pull-requests/proposing-changes-to-your-work-with-pull-requests/about-pull-requests) 🎉 +If you wish to contribute code, please read the information in the sections below. Then [fork](https://help.github.com/articles/fork-a-repo/) Google for WooCommerce, commit your changes, and [submit a pull request](https://docs.github.com/en/github/collaborating-with-pull-requests/proposing-changes-to-your-work-with-pull-requests/about-pull-requests) 🎉 -Google Listings and Ads is licensed under the GPLv3+, and all contributions to the project will be released under the same license. You maintain copyright over any contribution you make, and by submitting a pull request, you are agreeing to release that contribution under the GPLv3+ license. +Google for WooCommerce is licensed under the GPLv3+, and all contributions to the project will be released under the same license. You maintain copyright over any contribution you make, and by submitting a pull request, you are agreeing to release that contribution under the GPLv3+ license. ## Reporting Security Issues diff --git a/README.md b/README.md index 8d7a7a9590..b3c2d10244 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# Google Listings & Ads +# Google for WooCommerce [![PHP Unit Tests](https://github.com/woocommerce/google-listings-and-ads/actions/workflows/php-unit-tests.yml/badge.svg)](https://github.com/woocommerce/google-listings-and-ads/actions/workflows/php-unit-tests.yml) [![JavaScript Unit Tests](https://github.com/woocommerce/google-listings-and-ads/actions/workflows/js-unit-tests.yml/badge.svg)](https://github.com/woocommerce/google-listings-and-ads/actions/workflows/js-unit-tests.yml) @@ -19,7 +19,7 @@ This repository is not suitable for support. Please don't use our issue tracker For self help, start with our [user documentation](https://woocommerce.com/document/google-listings-and-ads/). -The best place to get support is the [WordPress.org Google Listings and Ads forum](https://wordpress.org/support/plugin/google-listings-and-ads/). +The best place to get support is the [WordPress.org Google for WooCommerce forum](https://wordpress.org/support/plugin/google-listings-and-ads/). If you have a WooCommerce.com account, you can [start a chat or open a ticket on WooCommerce.com](https://woocommerce.com/my-account/contact-support/). diff --git a/changelog.txt b/changelog.txt index 034a016c13..6fcd2d34ff 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,4 +1,4 @@ -*** WooCommerce Google Listings and Ads Changelog *** +*** Google for WooCommerce Changelog *** = 2.7.7 - 2024-07-24 = * Dev - Fix E2E tests failed with WC 9.1. @@ -179,7 +179,7 @@ * FIx - Undesired margin in Paid Campaign Creation Success Modal. * Fix - Adjust target on click events preventing GLA ID to be Undefined. * Fix - Tweak E2E tests for WC 8.1. -* Fix - WooCommerce Subscriptions compatibility: Fix the visible issue of the "Google Listings and Ads" tab and "Channel visibility" meta box for some unsupported product types. +* Fix - WooCommerce Subscriptions compatibility: Fix the visible issue of the "Google for WooCommerce" tab and "Channel visibility" meta box for some unsupported product types. * Tweak - WC 8.1.0 compatibility. = 2.5.5 - 2023-09-05 = @@ -350,7 +350,7 @@ * Add - Declare compatibility for High Performance Order Storage. * Dev - Selectively externalize bundled packages. * Fix - E2E Testing: Reduce the false positive rate and adjust the running events on GitHub Actions. -* Fix - Move the order of Google Listings & Ads below the Coupons in the Marketing menu of WooCommerce admin page. +* Fix - Move the order of Google for WooCommerce below the Coupons in the Marketing menu of WooCommerce admin page. * Fix - WC 6.9 compatibility: Shipping time settings should not appear after selecting the "complex" shipping option. * Fix - WC 6.9 compatibility: The free shipping threshold should be cleared after selecting the "No" free shipping option. * Fix - WC 6.9 compatibility: The selected free shipping option should be reset after setting all shipping rates to 0. @@ -560,7 +560,7 @@ = 1.12.0 - 2022-03-29 = * Add - Additional data points for tracker snapshot. * Add - Enables merchants to select multiple countries as their audience when creating a Google Ads campaign (Smart Shopping Campaign). -* Add - Google Listings And Ads product attributes icon. +* Add - Google for WooCommerce And Ads product attributes icon. * Add - Integration with WooCommerce Shipping Zone to automatically sync shipping settings to Merchant Center. * FIx - Show right link and message in Paid Campaigns report when there is no data available. * Fix - Cleanup synced products locally when disconnecting Merchant Center account. @@ -686,7 +686,7 @@ * Tweak - Hide channel visibility box and attributes tab if the setup is not completed. = 1.4.2 - 2021-08-24 = -* Fix - Fix a potential fatal error when WooCommerce isn't active while activating Google Listings and Ads. +* Fix - Fix a potential fatal error when WooCommerce isn't active while activating Google for WooCommerce. * Fix - Fix margin/padding styles for the AppButton when having spinner/icon/text. * Fix - Make audience country searchable in Setup Ads. * Fix - Remove file autoloads for namespaced packages. diff --git a/docs/gtag-consent-mode.md b/docs/gtag-consent-mode.md index 6c8edaec52..e5b78c6221 100644 --- a/docs/gtag-consent-mode.md +++ b/docs/gtag-consent-mode.md @@ -1,6 +1,6 @@ ## Google Analytics (gtag) Consent Mode -Unless you're running the [Google Analytics for WooCommerce](https://woocommerce.com/products/woocommerce-google-analytics/) extension for a more sophisticated configuration, Google Listings and Ads will add Google's `gtag` to help you track some customer behavior. +Unless you're running the [Google Analytics for WooCommerce](https://woocommerce.com/products/woocommerce-google-analytics/) extension for a more sophisticated configuration, Google for WooCommerce will add Google's `gtag` to help you track some customer behavior. To respect your customers' privacy, we set up the default state of [consent mode](https://support.google.com/analytics/answer/9976101). We set it to deny all the parameters for visitors from the EEA region. @@ -12,4 +12,4 @@ After the page loads, the consent for particular parameters can be updated by ot The extension does not provide any UI, like a cookie banner, to let your visitors grant consent for tracking. However, it's integrated with [WP Consent API](https://wordpress.org/plugins/wp-consent-api/), so you can pick another extension that provides a banner that meets your needs. -Each of those extensions may require additional setup or registration. Usually, the basic default setup works out of the box, but there may be some integration caveats. \ No newline at end of file +Each of those extensions may require additional setup or registration. Usually, the basic default setup works out of the box, but there may be some integration caveats. diff --git a/google-listings-and-ads.php b/google-listings-and-ads.php index a151561b15..243f1c48e9 100644 --- a/google-listings-and-ads.php +++ b/google-listings-and-ads.php @@ -1,6 +1,6 @@ { { __( - 'The Google Listings and Ads plugin allows you to upload your store and product data to Google. Your products will sync automatically to make relevant information available for free listings, Google Ads, and other Google services. You can create a new Merchant Center account or link an existing account to connect your store and list products across Google.', + 'The Google for WooCommerce plugin allows you to upload your store and product data to Google. Your products will sync automatically to make relevant information available for free listings, Google Ads, and other Google services. You can create a new Merchant Center account or link an existing account to connect your store and list products across Google.', 'google-listings-and-ads' ) }
@@ -220,7 +220,7 @@ const faqItems = [ <>{ __( - 'Create a new Google Ads account through Google Listings & Ads and a promotional code will be automatically applied to your account. You’ll have 60 days to spend $500 to qualify for the $500 ads credit.', + 'Create a new Google Ads account through Google for WooCommerce and a promotional code will be automatically applied to your account. You’ll have 60 days to spend $500 to qualify for the $500 ads credit.', 'google-listings-and-ads' ) }
diff --git a/js/src/get-started-page/features-card/index.js b/js/src/get-started-page/features-card/index.js index 0e21a3035c..00c5a6cd71 100644 --- a/js/src/get-started-page/features-card/index.js +++ b/js/src/get-started-page/features-card/index.js @@ -60,7 +60,7 @@ const FeaturesCard = () => { variant="body" > { __( - 'With Google Listings & Ads, connect with the right shoppers at the right moment when they’re looking to buy products like yours.', + 'With Google for WooCommerce, connect with the right shoppers at the right moment when they’re looking to buy products like yours.', 'google-listings-and-ads' ) } diff --git a/js/src/get-started-page/get-started-card/index.js b/js/src/get-started-page/get-started-card/index.js index 0bf79bdf2c..3dcc5e976a 100644 --- a/js/src/get-started-page/get-started-card/index.js +++ b/js/src/get-started-page/get-started-card/index.js @@ -42,7 +42,7 @@ const GetStartedCard = () => { className="gla-get-started-card__title" > { __( - 'Get your products in front of more shoppers with Google Listings & Ads', + 'Get your products in front of more shoppers with Google for WooCommerce', 'google-listings-and-ads' ) } diff --git a/js/src/get-started-page/unsupported-notices/index.js b/js/src/get-started-page/unsupported-notices/index.js index ede58e5141..ea8ce75125 100644 --- a/js/src/get-started-page/unsupported-notices/index.js +++ b/js/src/get-started-page/unsupported-notices/index.js @@ -42,7 +42,7 @@ const UnsupportedLanguage = () => { > { createInterpolateElement( __( - 'Your site language is' . $policy_text . '
'; - wp_add_privacy_policy_content( 'Google Listings & Ads', wpautop( $content, false ) ); + wp_add_privacy_policy_content( 'Google for WooCommerce', wpautop( $content, false ) ); } /** diff --git a/src/Admin/Product/Attributes/AttributesTab.php b/src/Admin/Product/Attributes/AttributesTab.php index 85f12c5888..682765a88f 100644 --- a/src/Admin/Product/Attributes/AttributesTab.php +++ b/src/Admin/Product/Attributes/AttributesTab.php @@ -94,7 +94,7 @@ function () { } /** - * Adds the Google Listing & Ads tab to the WooCommerce product data box. + * Adds the Google for WooCommerce tab to the WooCommerce product data box. * * @param array $tabs The current product data tabs. * @@ -102,7 +102,7 @@ function () { */ private function add_tab( array $tabs ): array { $tabs['gla_attributes'] = [ - 'label' => 'Google Listings and Ads', + 'label' => 'Google for WooCommerce', 'class' => 'gla', 'target' => 'gla_attributes', ]; diff --git a/src/Admin/Product/Attributes/AttributesTrait.php b/src/Admin/Product/Attributes/AttributesTrait.php index 4d80abe30c..cb177345f1 100644 --- a/src/Admin/Product/Attributes/AttributesTrait.php +++ b/src/Admin/Product/Attributes/AttributesTrait.php @@ -10,7 +10,7 @@ */ trait AttributesTrait { /** - * Return an array of WooCommerce product types that the Google Listings and Ads tab can be displayed for. + * Return an array of WooCommerce product types that the Google for WooCommerce tab can be displayed for. * * @return array of WooCommerce product types (e.g. 'simple', 'variable', etc.) */ diff --git a/src/Admin/ProductBlocksService.php b/src/Admin/ProductBlocksService.php index 7286ce006d..a3843a6a81 100644 --- a/src/Admin/ProductBlocksService.php +++ b/src/Admin/ProductBlocksService.php @@ -145,7 +145,7 @@ public function hook_block_template( BlockInterface $block ): void { 'id' => 'google-listings-and-ads-group', 'order' => 100, 'attributes' => [ - 'title' => __( 'Google Listings & Ads', 'google-listings-and-ads' ), + 'title' => __( 'Google for WooCommerce', 'google-listings-and-ads' ), ], ] ); diff --git a/src/Autoloader.php b/src/Autoloader.php index 8f72cea100..61c2f0f7cd 100644 --- a/src/Autoloader.php +++ b/src/Autoloader.php @@ -48,7 +48,7 @@ public static function init() { protected static function missing_autoloader() { if ( defined( 'WP_DEBUG' ) && WP_DEBUG ) { error_log( // phpcs:ignore WordPress.PHP.DevelopmentFunctions - esc_html__( 'Your installation of Google Listings and Ads is incomplete. If you installed from GitHub, please refer to this document to set up your development environment: https://github.com/woocommerce/woocommerce/wiki/How-to-set-up-WooCommerce-development-environment', 'google-listings-and-ads' ) + esc_html__( 'Your installation of Google for WooCommerce is incomplete. If you installed from GitHub, please refer to this document to set up your development environment: https://github.com/woocommerce/woocommerce/wiki/How-to-set-up-WooCommerce-development-environment', 'google-listings-and-ads' ) ); } add_action( @@ -60,7 +60,7 @@ function () { ', '' ); diff --git a/src/ConnectionTest.php b/src/ConnectionTest.php index 4172a20b7a..764ed10f13 100644 --- a/src/ConnectionTest.php +++ b/src/ConnectionTest.php @@ -137,7 +137,7 @@ protected function render_admin_page() {Google Listings & Ads connection testing page used for debugging purposes. Debug responses are output at the top of the page.
+Google for WooCommerce connection testing page used for debugging purposes. Debug responses are output at the top of the page.