Rename conversion tracking ID -> conversion ID.

google · Feb 24, 2025 · c308e9d · c308e9d
1 parent fc25f8d
commit c308e9d
Show file tree

Hide file tree

Showing 10 changed files with 28 additions and 42 deletions.
diff --git a/assets/js/components/notifications/SubtleNotification.stories.js b/assets/js/components/notifications/SubtleNotification.stories.js
@@ -30,15 +30,15 @@ function Template( { ...args } ) {
 export const Success = Template.bind( {} );
 Success.storyName = 'Success';
 Success.args = {
-	title: 'Success! Your Conversion Tracking ID was added to your site',
+	title: 'Success! Your Conversion ID was added to your site',
 	dismissLabel: 'Ok, got it',
 };
 Success.scenario = {};
 
 export const SuccessWithDescription = Template.bind( {} );
 SuccessWithDescription.storyName = 'Success With Description';
 SuccessWithDescription.args = {
-	title: 'Success! Your Conversion Tracking ID was added to your site',
+	title: 'Success! Your Conversion ID was added to your site',
 	description: 'You can now track conversions for your Ads campaigns',
 	dismissLabel: 'Ok, got it',
 };
@@ -47,7 +47,7 @@ SuccessWithDescription.scenario = {};
 export const SuccessWithCTA = Template.bind( {} );
 SuccessWithCTA.storyName = 'Success With CTA';
 SuccessWithCTA.args = {
-	title: 'Success! Your Conversion Tracking ID was added to your site',
+	title: 'Success! Your Conversion ID was added to your site',
 	description: 'You can now track conversions for your Ads campaigns',
 	dismissLabel: 'Ok, got it',
 	ctaLabel: 'Learn more',
@@ -57,7 +57,7 @@ SuccessWithCTA.scenario = {};
 export const SuccessWithExternalCTA = Template.bind( {} );
 SuccessWithExternalCTA.storyName = 'Success With External CTA';
 SuccessWithExternalCTA.args = {
-	title: 'Success! Your Conversion Tracking ID was added to your site',
+	title: 'Success! Your Conversion ID was added to your site',
 	description: 'You can now track conversions for your Ads campaigns',
 	dismissLabel: 'Ok, got it',
 	ctaLabel: 'Learn more',
@@ -69,7 +69,7 @@ SuccessWithExternalCTA.scenario = {};
 export const SuccessWithCustomIcon = Template.bind( {} );
 SuccessWithCustomIcon.storyName = 'Success With Custom Icon';
 SuccessWithCustomIcon.args = {
-	title: 'Success! Your Conversion Tracking ID was added to your site',
+	title: 'Success! Your Conversion ID was added to your site',
 	description: 'You can now track conversions for your Ads campaigns',
 	dismissLabel: 'Ok, got it',
 	ctaLabel: 'Learn more',
@@ -82,7 +82,7 @@ SuccessWithCustomIcon.scenario = {};
 export const SuccessWithoutIcon = Template.bind( {} );
 SuccessWithoutIcon.storyName = 'Success Without Icon';
 SuccessWithoutIcon.args = {
-	title: 'Success! Your Conversion Tracking ID was added to your site',
+	title: 'Success! Your Conversion ID was added to your site',
 	dismissLabel: 'Ok, got it',
 	ctaLabel: 'Learn more',
 	ctaLink: 'https://sitekit.withgoogle.com/documentation',
@@ -94,7 +94,7 @@ SuccessWithoutIcon.scenario = {};
 export const Warning = Template.bind( {} );
 Warning.storyName = 'Warning';
 Warning.args = {
-	title: 'Warning! Your Conversion Tracking ID was not added to your site',
+	title: 'Warning! Your Conversion ID was not added to your site',
 	dismissLabel: 'Ok, got it',
 	variant: 'warning',
 };
@@ -103,7 +103,7 @@ Warning.scenario = {};
 export const WarningWithDescription = Template.bind( {} );
 WarningWithDescription.storyName = 'Warning With Description';
 WarningWithDescription.args = {
-	title: 'Warning! Your Conversion Tracking ID was not added to your site',
+	title: 'Warning! Your Conversion ID was not added to your site',
 	description: 'You cannot track conversions for your Ads campaigns',
 	dismissLabel: 'Ok, got it',
 	variant: 'warning',
@@ -113,7 +113,7 @@ WarningWithDescription.scenario = {};
 export const WarningWithCTA = Template.bind( {} );
 WarningWithCTA.storyName = 'Warning With CTA';
 WarningWithCTA.args = {
-	title: 'Warning! Your Conversion Tracking ID was not added to your site',
+	title: 'Warning! Your Conversion ID was not added to your site',
 	description: 'You cannot track conversions for your Ads campaigns',
 	dismissLabel: 'Ok, got it',
 	ctaLabel: 'Learn more',
@@ -124,7 +124,7 @@ WarningWithCTA.scenario = {};
 export const WarningWithExternalCTA = Template.bind( {} );
 WarningWithExternalCTA.storyName = 'Warning With External CTA';
 WarningWithExternalCTA.args = {
-	title: 'Warning! Your Conversion Tracking ID was not added to your site',
+	title: 'Warning! Your Conversion ID was not added to your site',
 	description: 'You cannot track conversions for your Ads campaigns',
 	dismissLabel: 'Ok, got it',
 	ctaLabel: 'Learn more',
@@ -137,7 +137,7 @@ WarningWithExternalCTA.scenario = {};
 export const WarningWithCustomIcon = Template.bind( {} );
 WarningWithCustomIcon.storyName = 'Warning With Custom Icon';
 WarningWithCustomIcon.args = {
-	title: 'Warning! Your Conversion Tracking ID was not added to your site',
+	title: 'Warning! Your Conversion ID was not added to your site',
 	description: 'You cannot track conversions for your Ads campaigns',
 	dismissLabel: 'Ok, got it',
 	ctaLabel: 'Learn more',
@@ -151,7 +151,7 @@ WarningWithCustomIcon.scenario = {};
 export const WarningWithoutIcon = Template.bind( {} );
 WarningWithoutIcon.storyName = 'Warning Without Icon';
 WarningWithoutIcon.args = {
-	title: 'Warning! Your Conversion Tracking ID was added to your site',
+	title: 'Warning! Your Conversion ID was added to your site',
 	dismissLabel: 'Ok, got it',
 	ctaLabel: 'Learn more',
 	ctaLink: 'https://sitekit.withgoogle.com/documentation',
@@ -164,7 +164,7 @@ WarningWithoutIcon.scenario = {};
 export const NonDismissible = Template.bind( {} );
 NonDismissible.storyName = 'Non dismissible';
 NonDismissible.args = {
-	title: 'Success! Your Conversion Tracking ID was added to your site',
+	title: 'Success! Your Conversion ID was added to your site',
 	description: 'You can now track conversions for your Ads campaigns',
 	ctaLabel: 'Learn more',
 	ctaLink: 'https://sitekit.withgoogle.com/documentation',

diff --git a/assets/js/modules/ads/components/common/ConversionIDTextField.js b/assets/js/modules/ads/components/common/ConversionIDTextField.js
@@ -76,7 +76,7 @@ export default function ConversionIDTextField( {
 		<div className="googlesitekit-settings-module__fields-group">
 			{ ! hideHeading && (
 				<h4 className="googlesitekit-settings-module__fields-group-title">
-					{ __( 'Conversion Tracking ID', 'google-site-kit' ) }
+					{ __( 'Conversion ID', 'google-site-kit' ) }
 				</h4>
 			) }
 
@@ -87,7 +87,7 @@ export default function ConversionIDTextField( {
 			) }
 
 			<TextField
-				label={ __( 'Conversion Tracking ID', 'google-site-kit' ) }
+				label={ __( 'Conversion ID', 'google-site-kit' ) }
 				className={ classnames(
 					'googlesitekit-text-field-conversion-tracking-id',
 					{

diff --git a/assets/js/modules/ads/components/notifications/SetupSuccessSubtleNotification.js b/assets/js/modules/ads/components/notifications/SetupSuccessSubtleNotification.js
@@ -41,7 +41,7 @@ export default function SetupSuccessSubtleNotification( { id, Notification } ) {
 		<Notification>
 			<SubtleNotification
 				title={ __(
-					'Success! Your Conversion Tracking ID was added to your site',
+					'Success! Your Conversion ID was added to your site',
 					'google-site-kit'
 				) }
 				description={ __(

diff --git a/assets/js/modules/ads/components/settings/SettingsForm.js b/assets/js/modules/ads/components/settings/SettingsForm.js
@@ -73,7 +73,7 @@ export default function SettingsForm() {
 					<div className="googlesitekit-setup-module__inputs">
 						<ConversionIDTextField
 							helperText={ __(
-								'The Conversion Tracking ID will help track the performance of ad campaigns for the corresponding account',
+								'The Conversion ID will help track the performance of ad campaigns for the corresponding account',
 								'google-site-kit'
 							) }
 						/>
@@ -84,10 +84,7 @@ export default function SettingsForm() {
 					<div>
 						<div className="googlesitekit-settings-module__meta-item">
 							<h5 className="googlesitekit-settings-module__meta-item-type">
-								{ __(
-									'Conversion Tracking ID',
-									'google-site-kit'
-								) }
+								{ __( 'Conversion ID', 'google-site-kit' ) }
 							</h5>
 							<p className="googlesitekit-settings-module__meta-item-data">
 								{ conversionIDValue === '' &&

diff --git a/assets/js/modules/ads/components/settings/SettingsView.js b/assets/js/modules/ads/components/settings/SettingsView.js
@@ -95,7 +95,7 @@ export default function SettingsView() {
 			{ ! isAdBlockerActive && (
 				<div className="googlesitekit-settings-module__meta-item">
 					<h5 className="googlesitekit-settings-module__meta-item-type">
-						{ __( 'Conversion Tracking ID', 'google-site-kit' ) }
+						{ __( 'Conversion ID', 'google-site-kit' ) }
 					</h5>
 					<p className="googlesitekit-settings-module__meta-item-data">
 						{ conversionIDValue === '' &&

diff --git a/assets/js/modules/ads/components/setup/SetupMainPAX.js b/assets/js/modules/ads/components/setup/SetupMainPAX.js
@@ -219,19 +219,13 @@ export default function SetupMainPAX( { finishSetup } ) {
 								>
 									<h3>
 										{ __(
-											'Ads Setup Wizard',
+											'Set up a new Ads account',
 											'google-site-kit'
 										) }
 									</h3>
-									<strong>
-										{ __(
-											'Don’t have an Ads account yet?',
-											'google-site-kit'
-										) }
-									</strong>
 									<p className="instructions">
 										{ __(
-											'Create your Ads account using a step by step wizard that will help you set up your campaign, define your goals and set billing information. To create new Ads account you’ll be asked to grant Site Kit additional permissions during the account creation process.',
+											'Create your first Ads campaign, add billing information, and choose your conversion goals. To create a new Ads account, you’ll need to grant Site Kit additional permissions during the account creation process.',
 											'google-site-kit'
 										) }
 									</p>
@@ -262,27 +256,22 @@ export default function SetupMainPAX( { finishSetup } ) {
 									mdSize={ 8 }
 									lgSize={ 2 }
 								>
+									<span className="divider-line" />
 									<span className="divider-label">
 										{ __( 'OR', 'google-site-kit' ) }
 									</span>
 								</Cell>
 								<Cell smSize={ 8 } mdSize={ 8 } lgSize={ 5 }>
 									<h3>
 										{ __(
-											'Connect Ads Manually',
+											'Connect an existing Ads account',
 											'google-site-kit'
 										) }
 									</h3>
-									<strong>
-										{ __(
-											'Already have an Ads account?',
-											'google-site-kit'
-										) }
-									</strong>
 									<p className="instructions">
 										{ createInterpolateElement(
 											__(
-												'Add your conversion ID below. Site Kit will place it on your site so you can track the performance of your Google Ads campaigns.<a>Learn more</a>.<br></br>You can always change this later in Site Kit Settings.',
+												'To track conversions for your Ads campaign, you need to add your Conversion ID to Site Kit. You can always change the Conversion ID later in Site Kit Settings. <a>Learn more</a>',
 												'google-site-kit'
 											),
 											{

diff --git a/assets/js/modules/analytics-4/components/settings/AdsConversionIDSettingsNotice.js b/assets/js/modules/analytics-4/components/settings/AdsConversionIDSettingsNotice.js
@@ -101,7 +101,7 @@ export default function AdsConversionIDSettingsNotice() {
 			Icon={ InfoCircleIcon }
 			notice={ createInterpolateElement(
 				__(
-					'Ads Conversion Tracking ID has been moved to <a>Ads settings</a>',
+					'Ads Conversion ID has been moved to <a>Ads settings</a>',
 					'google-site-kit'
 				),
 				{

diff --git a/assets/js/modules/analytics-4/components/settings/AdsConversionIDSettingsNotice.test.js b/assets/js/modules/analytics-4/components/settings/AdsConversionIDSettingsNotice.test.js
@@ -94,7 +94,7 @@ describe( 'AdsConversionIDSettingsNotice', () => {
 		} );
 
 		expect( container ).toHaveTextContent(
-			'Ads Conversion Tracking ID has been moved to Ads settings'
+			'Ads Conversion ID has been moved to Ads settings'
 		);
 
 		expect( container ).toMatchSnapshot();

diff --git a/.../analytics-4/components/settings/__snapshots__/AdsConversionIDSettingsNotice.test.js.snap b/.../analytics-4/components/settings/__snapshots__/AdsConversionIDSettingsNotice.test.js.snap
@@ -16,7 +16,7 @@ exports[`AdsConversionIDSettingsNotice should render the notice 1`] = `
       <div
         class="googlesitekit-settings-notice__text"
       >
-        Ads Conversion Tracking ID has been moved to 
+        Ads Conversion ID has been moved to
         <a
           class="googlesitekit-cta-link"
           href="undefined#/connected-services/ads"

diff --git a/includes/Modules/Ads.php b/includes/Modules/Ads.php
@@ -389,7 +389,7 @@ public function get_debug_fields() {
 
 		$debug_fields = array(
 			'ads_conversion_tracking_id' => array(
-				'label' => __( 'Ads: Conversion Tracking ID', 'google-site-kit' ),
+				'label' => __( 'Ads: Conversion ID', 'google-site-kit' ),
 				'value' => $settings['conversionID'],
 				'debug' => Debug_Data::redact_debug_value( $settings['conversionID'] ),
 			),