Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update references to "One Tap" for consistency. #10184

Merged
merged 2 commits into from
Feb 6, 2025
Merged

Update references to "One Tap" for consistency. #10184

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6fe00f1
Update references to "One Tap" for consistency.
aaemnnosttv Feb 6, 2025
44ee435
Approve visual changes.
aaemnnosttv Feb 6, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions assets/js/modules/sign-in-with-google/components/common/OneTapToggles.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }
Expand All @@ -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>
Expand Down
8 changes: 4 additions & 4 deletions assets/js/modules/sign-in-with-google/components/common/SettingsNotice.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -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,
Expand All @@ -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,
Expand All @@ -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,
Expand Down
4 changes: 2 additions & 2 deletions changelog.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,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).
Copy link
Collaborator

@techanvil techanvil Feb 6, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@aaemnnosttv, did you mean to amend the changelog? It obviously reads more correctly, I'm just wondering if we do amend changelogs for previous versions.

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I did, yes. I agree we don't normally make updates to the changelog, but I don't think there is any reason not to in this case as it's not a meaning-altering change.


**Enhanced**

Expand Down Expand Up @@ -130,7 +130,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).
Expand Down
6 changes: 3 additions & 3 deletions includes/Modules/Sign_In_With_Google.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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;
Expand Down Expand Up @@ -500,7 +500,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',
),
Expand Down
Binary file modified ...t_Modules_SignInWithGoogle_Settings_SettingsEdit_Default_0_document_0_small.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified ..._Modules_SignInWithGoogle_Settings_SettingsEdit_Default_0_document_1_medium.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified ...t_Modules_SignInWithGoogle_Settings_SettingsEdit_Default_0_document_2_large.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion tests/phpunit/integration/Modules/Sign_In_With_GoogleTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down
Loading