Merge pull request #10184 from google/update/10128-one-tap-naming

Update references to "One Tap" for consistency.

assets/js/modules/sign-in-with-google/components/common/OneTapToggles.js

@@ -113,7 +113,7 @@ export default function OneTapToggles() {
 			<div className="googlesitekit-settings-module__fields-group googlesitekit-settings-module__one-tap-on-all-pages">
 				<Switch
 					label={ __(
-						'One-Tap enabled on all pages',
+						'One Tap enabled on all pages',
 						'google-site-kit'
 					) }
 					checked={ !! oneTapOnAllPages }
@@ -124,11 +124,11 @@ export default function OneTapToggles() {
 				<HelperText persistent>
 					{ !! oneTapOnAllPages
 						? __(
-								'One-Tap will be available on every page on this website.',
+								'One Tap will be available on every page on this website.',
 								'google-site-kit'
 						  )
 						: __(
-								'One-Tap will only appear on existing login pages.',
+								'One Tap will only appear on existing login pages.',
 								'google-site-kit'
 						  ) }
 				</HelperText>

assets/js/modules/sign-in-with-google/components/common/SettingsNotice.test.js

@@ -73,7 +73,7 @@ describe( 'SettingsNotice', () => {
 		).toHaveClass( 'googlesitekit-anyone-can-register-disabled-notice' );
 	} );
 
-	it( 'should render AnyoneCanRegisterDisabledNotice when anyoneCanRegister is false, both one tap settings are true and WooCommerce is active but isWooCommerceRegistrationEnabled is true', () => {
+	it( 'should render AnyoneCanRegisterDisabledNotice when anyoneCanRegister is false, both One Tap settings are true and WooCommerce is active but isWooCommerceRegistrationEnabled is true', () => {
 		registry.dispatch( MODULES_SIGN_IN_WITH_GOOGLE ).setSettings( {
 			oneTapEnabled: true,
 			oneTapOnAllPages: true,
@@ -95,7 +95,7 @@ describe( 'SettingsNotice', () => {
 		).toHaveClass( 'googlesitekit-anyone-can-register-disabled-notice' );
 	} );
 
-	it( 'should render AnyoneCanRegisterDisabledNotice when anyoneCanRegister is false, both one tap settings are true, WooCommerce is active but isWooCommerceRegistrationEnabled is already true', async () => {
+	it( 'should render AnyoneCanRegisterDisabledNotice when anyoneCanRegister is false, both One Tap settings are true, WooCommerce is active but isWooCommerceRegistrationEnabled is already true', async () => {
 		registry.dispatch( MODULES_SIGN_IN_WITH_GOOGLE ).setSettings( {
 			oneTapEnabled: true,
 			oneTapOnAllPages: true,
@@ -119,7 +119,7 @@ describe( 'SettingsNotice', () => {
 		).toHaveClass( 'googlesitekit-anyone-can-register-disabled-notice' );
 	} );
 
-	it( 'should render RegistrationDisabledNotice when anyoneCanRegister is false, both one tap settings are true and WooCommerce is not active', () => {
+	it( 'should render RegistrationDisabledNotice when anyoneCanRegister is false, both One Tap settings are true and WooCommerce is not active', () => {
 		registry.dispatch( MODULES_SIGN_IN_WITH_GOOGLE ).setSettings( {
 			oneTapEnabled: true,
 			oneTapOnAllPages: true,
@@ -138,7 +138,7 @@ describe( 'SettingsNotice', () => {
 		);
 	} );
 
-	it( 'should render RegistrationDisabledNotice when anyoneCanRegister is false, both one tap settings are true, WooCommerce is active and isWooCommerceRegistrationEnabled is false', async () => {
+	it( 'should render RegistrationDisabledNotice when anyoneCanRegister is false, both One Tap settings are true, WooCommerce is active and isWooCommerceRegistrationEnabled is false', async () => {
 		registry.dispatch( MODULES_SIGN_IN_WITH_GOOGLE ).setSettings( {
 			oneTapEnabled: true,
 			oneTapOnAllPages: true,

changelog.txt

@@ -66,7 +66,7 @@
 
 * Add `library_name` parameter to Sign in with Google button. See [#9924](https://github.com/google/site-kit-wp/issues/9924).
 * Add incremental ESLint rule to avoid defining `scenario.label` on stories. See [#9865](https://github.com/google/site-kit-wp/issues/9865).
-* Add option to enable "One-tap" sign-in across site when using Sign in with Google. See [#9861](https://github.com/google/site-kit-wp/issues/9861).
+* Add option to enable "One Tap" sign-in across site when using Sign in with Google. See [#9861](https://github.com/google/site-kit-wp/issues/9861).
 
 **Enhanced**
 
@@ -165,7 +165,7 @@
 * Update Sign in with Google descriptions in Site Health. See [#9680](https://github.com/google/site-kit-wp/issues/9680).
 * Update the Sign in with Google login to use the popup approach. See [#9677](https://github.com/google/site-kit-wp/issues/9677).
 * Integrate the First-party mode proxy script that will allow Analytics events to be tracked via requests made from the browser to the user's site rather than directly to Google's servers. See [#9665](https://github.com/google/site-kit-wp/issues/9665).
-* Add info to the "One-tap" option in Sign in with Google settings. See [#9643](https://github.com/google/site-kit-wp/issues/9643).
+* Add info to the "One Tap" option in Sign in with Google settings. See [#9643](https://github.com/google/site-kit-wp/issues/9643).
 * Do not show "Maybe later" in Key Metrics Admin Settings callout banner. See [#9636](https://github.com/google/site-kit-wp/issues/9636).
 * Implement the `fetchGetFPMServerRequirementStatus()` Redux action used to retrieve the FPM server requirement status. See [#9634](https://github.com/google/site-kit-wp/issues/9634).
 * Add an `fpm-server-requirement-status` API endpoint to verify First-Party Mode readiness by performing FPFE health checks and verifying direct PHP script access. See [#9632](https://github.com/google/site-kit-wp/issues/9632).

includes/Modules/Sign_In_With_Google.php

@@ -317,7 +317,7 @@ public function is_connected() {
 	}
 
 	/**
-	 * Renders the Sign in with Google JS script tags, One-tap code, and
+	 * Renders the Sign in with Google JS script tags, One Tap code, and
 	 * buttons.
 	 *
 	 * @since 1.139.0
@@ -337,7 +337,7 @@ private function render_signinwithgoogle() {
 		}
 
 		// If this is not the WordPress or WooCommerce login page, check to
-		// see if "One-tap enabled on all pages" is set first. If it isnt:
+		// see if "One Tap enabled on all pages" is set first. If it isnt:
 		// don't render the Sign in with Google JS.
 		if ( ! $is_wp_login && ! $is_woocommerce_login && ! $settings['oneTapOnAllPages'] ) {
 			return;
@@ -508,7 +508,7 @@ public function get_debug_fields() {
 			),
 			'sign_in_with_google_use_snippet'              => array(
 				/* translators: %s: Sign in with Google service name */
-				'label' => sprintf( __( '%s: One-tap Enabled', 'google-site-kit' ), _x( 'Sign in with Google', 'Service name', 'google-site-kit' ) ),
+				'label' => sprintf( __( '%s: One Tap Enabled', 'google-site-kit' ), _x( 'Sign in with Google', 'Service name', 'google-site-kit' ) ),
 				'value' => $settings['oneTapEnabled'] ? __( 'Yes', 'google-site-kit' ) : __( 'No', 'google-site-kit' ),
 				'debug' => $settings['oneTapEnabled'] ? 'yes' : 'no',
 			),

tests/phpunit/integration/Modules/Sign_In_With_GoogleTest.php

@@ -126,7 +126,7 @@ public function test_render_signinwithgoogle() {
 		// The button shouldn't be rendered on a non-login page.
 		$this->assertStringNotContainsString( 'Sign in with Google button added by Site Kit', $output );
 
-		// Enable the Sign in with Google One-tap on all pages.
+		// Enable the Sign in with Google One Tap on all pages.
 		$this->module->get_settings()->set(
 			array(
 				'clientID'         => '1234567890.googleusercontent.com',