From 0b6f8c3b82a0854bb8617da6e0facdda449e2d89 Mon Sep 17 00:00:00 2001 From: Stephenie Harris Date: Mon, 16 Mar 2020 14:16:43 -0600 Subject: [PATCH 1/2] Updating magic link instruction text. --- WordPressAuthenticator.podspec | 2 +- .../NUX/NUXLinkMailViewController.swift | 10 ++-------- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/WordPressAuthenticator.podspec b/WordPressAuthenticator.podspec index 8f4a41d8b..9f5d1d1a5 100644 --- a/WordPressAuthenticator.podspec +++ b/WordPressAuthenticator.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = "WordPressAuthenticator" - s.version = "1.11.0-beta.9" + s.version = "1.11.0-beta.10" s.summary = "WordPressAuthenticator implements an easy and elegant way to authenticate your WordPress Apps." s.description = <<-DESC diff --git a/WordPressAuthenticator/NUX/NUXLinkMailViewController.swift b/WordPressAuthenticator/NUX/NUXLinkMailViewController.swift index 4bb212137..f227af867 100644 --- a/WordPressAuthenticator/NUX/NUXLinkMailViewController.swift +++ b/WordPressAuthenticator/NUX/NUXLinkMailViewController.swift @@ -75,14 +75,8 @@ class NUXLinkMailViewController: LoginViewController { usePasswordButton?.isHidden = emailMagicLinkSource == .signup - label?.text = { - switch emailMagicLinkSource { - case .login: - return NSLocalizedString("Your magic link is on its way! Check your email on this device, and tap the link in the email you receive from WordPress.com", comment: "Instructional text on how to open the email containing a magic link.") - case .signup: - return NSLocalizedString("We sent you a magic signup link! Check your email on this device, and tap the link in the email to finish signing up.", comment: "Instructional text on how to open the email containing a magic link.") - } - }() + label?.text = NSLocalizedString("Check your email on this device, and tap the link in the email you receive from WordPress.com.\n\nNot seeing the email? Check your Spam or Junk Mail folder.", comment: "Instructional text on how to open the email containing a magic link.") + label?.textColor = WordPressAuthenticator.shared.style.instructionColor } From c128a1881dbb673629256974541b367b65503e47 Mon Sep 17 00:00:00 2001 From: Stephenie Harris Date: Mon, 16 Mar 2020 15:11:04 -0600 Subject: [PATCH 2/2] Update text. --- WordPressAuthenticator/NUX/NUXLinkMailViewController.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/WordPressAuthenticator/NUX/NUXLinkMailViewController.swift b/WordPressAuthenticator/NUX/NUXLinkMailViewController.swift index f227af867..bc546eecc 100644 --- a/WordPressAuthenticator/NUX/NUXLinkMailViewController.swift +++ b/WordPressAuthenticator/NUX/NUXLinkMailViewController.swift @@ -75,7 +75,7 @@ class NUXLinkMailViewController: LoginViewController { usePasswordButton?.isHidden = emailMagicLinkSource == .signup - label?.text = NSLocalizedString("Check your email on this device, and tap the link in the email you receive from WordPress.com.\n\nNot seeing the email? Check your Spam or Junk Mail folder.", comment: "Instructional text on how to open the email containing a magic link.") + label?.text = NSLocalizedString("Check your email on this device, and tap the link in the email you received from WordPress.com.\n\nNot seeing the email? Check your Spam or Junk Mail folder.", comment: "Instructional text on how to open the email containing a magic link.") label?.textColor = WordPressAuthenticator.shared.style.instructionColor }