Skip to content

Commit 09a7d6c

Browse files
authored
Merge pull request #7607 from woocommerce/merge/10.0.1-into-10.1
Merge `release/10.0.1` (hotfix) back into current `release/10.1`
2 parents b1471f6 + 7f95212 commit 09a7d6c

File tree

2 files changed

+8
-0
lines changed

2 files changed

+8
-0
lines changed

WooCommerce/Classes/Authentication/AuthenticationConstants.swift

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,13 @@ struct AuthenticationConstants {
4444
comment: "Sign in instructions for logging in with a username and password."
4545
)
4646

47+
/// Sign in using Apple screen's instructions.
48+
///
49+
static let applePasswordInstructions = NSLocalizedString(
50+
"To proceed with this account, please first log in with your WordPress.com password. This will only be asked once.",
51+
comment: "Sign in instructions asking user to enter WordPress.com password to proceed with sign in using Apple process"
52+
)
53+
4754
/// Title of "Continue With WordPress.com" button in Login Prologue
4855
//
4956
static let continueWithWPButtonTitle = NSLocalizedString(

WooCommerce/Classes/Authentication/AuthenticationManager.swift

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -106,6 +106,7 @@ class AuthenticationManager: Authentication {
106106
siteLoginInstructions: AuthenticationConstants.siteInstructions,
107107
siteCredentialInstructions: AuthenticationConstants.siteCredentialInstructions,
108108
usernamePasswordInstructions: AuthenticationConstants.usernamePasswordInstructions,
109+
applePasswordInstructions: AuthenticationConstants.applePasswordInstructions,
109110
continueWithWPButtonTitle: AuthenticationConstants.continueWithWPButtonTitle,
110111
enterYourSiteAddressButtonTitle: AuthenticationConstants.enterYourSiteAddressButtonTitle,
111112
signInWithSiteCredentialsButtonTitle: AuthenticationConstants.signInWithSiteCredsButtonTitle,

0 commit comments

Comments
 (0)