"Log in" button wording updates and footer text updates.

Author: iamdharmesh

assets/css/admin.css

@@ -382,6 +382,17 @@ th.mailchimp-connect {
 body.admin_page_mailchimp_sf_create_account,
 body.toplevel_page_mailchimp_sf_options {
 	background-color: #F6F6F4;
+	font-family: 'Graphik Mailchimp Web', ui-sans-serif, system-ui, sans-serif;
+}
+
+body.admin_page_mailchimp_sf_create_account a,
+body.toplevel_page_mailchimp_sf_options a {
+	color: var(--mailchimp-color-link);
+}
+
+body.admin_page_mailchimp_sf_create_account #footer-upgrade,
+body.toplevel_page_mailchimp_sf_options #footer-upgrade {
+	display: none;
 }
 
 .mailchimp-sf-create-account__body-inner {

includes/admin/templates/create-account-page.php

@@ -269,7 +269,7 @@
 										<path class="opacity-75" fill="currentColor" d="M4 12a8 8 0 018-8V0C5.373 0 0 5.373 0 12h4zm2 5.291A7.962 7.962 0 014 12H0c0 3.042 1.135 5.824 3 7.938l3-2.647z"></path>
 								</svg>
 							</span>
-							<?php esc_html_e( 'Activate Account', 'mailchimp' ); ?>
+							<?php esc_html_e( 'Activate account', 'mailchimp' ); ?>
 					</button>
 				</div>
 			</form>

includes/admin/templates/login.php

@@ -13,7 +13,7 @@
 			<div class="title"><?php esc_html_e( 'Let\'s connect your Mailchimp account', 'mailchimp' ); ?></div>
 			<p class="h4">
 				<?php
-				esc_html_e( 'Log in to your existing Mailchimp account or create a new account to authorize and connect to WordPress. Setup should take just a few minutes.', 'mailchimp' );
+				esc_html_e( 'Log in to your Mailchimp account or create a new account to authorize and connect to WordPress. Setup should take just a few minutes.', 'mailchimp' );
 				?>
 			</p>
 
@@ -25,7 +25,7 @@
 								<path class="opacity-75" fill="currentColor" d="M4 12a8 8 0 018-8V0C5.373 0 0 5.373 0 12h4zm2 5.291A7.962 7.962 0 014 12H0c0 3.042 1.135 5.824 3 7.938l3-2.647z"></path>
 						</svg>
 					</span>
-					<?php esc_html_e( 'Connect account', 'mailchimp' ); ?>
+					<?php esc_html_e( 'Log in', 'mailchimp' ); ?>
 				</button>
 				<a href="<?php echo esc_url( admin_url( 'admin.php?page=mailchimp_sf_create_account' ) ); ?>" class="button mailchimp-sf-button button-secondary"><?php esc_html_e( 'Create an account', 'mailchimp' ); ?></a>
 			</div>

includes/admin/templates/suggest-to-login.php

@@ -33,7 +33,7 @@
 						<path class="opacity-75" fill="currentColor" d="M4 12a8 8 0 018-8V0C5.373 0 0 5.373 0 12h4zm2 5.291A7.962 7.962 0 014 12H0c0 3.042 1.135 5.824 3 7.938l3-2.647z"></path>
 				</svg>
 			</span>
-			<?php esc_html_e( 'Connect account', 'mailchimp' ); ?>
+			<?php esc_html_e( 'Log in', 'mailchimp' ); ?>
 		</button>
 		<p class="mailchimp-sf-oauth-error error-field" style="display:none;"></p>
 		<div id="mailchimp-sf-popup-blocked-modal" style="display:none;">

includes/class-mailchimp-admin.php

@@ -37,6 +37,7 @@ public function init() {
 
 		add_action( 'admin_enqueue_scripts', array( $this, 'enqueue_admin_page_scripts' ) );
 		add_action( 'admin_menu', array( $this, 'add_create_account_page' ) );
+		add_filter( 'admin_footer_text', array( $this, 'admin_footer_text' ) );
 	}
 
 	/**
@@ -331,7 +332,7 @@ public function admin_notices() {
 					<?php
 					$message = sprintf(
 						/* translators: Placeholders: %1$s - <a> tag, %2$s - </a> tag */
-						__( 'Heads up! It looks like you\'re using an API key to connect with Mailchimp, which is now deprecated. Please log out and reconnect your Mailchimp account using the new OAuth authentication by clicking the "Connect Account" button on the %1$splugin settings%2$s page.', 'mailchimp' ),
+						__( 'Heads up! It looks like you\'re using an API key to connect with Mailchimp, which is now deprecated. Please log out and reconnect your Mailchimp account using the new OAuth authentication by clicking the "Log in" button on the %1$splugin settings%2$s page.', 'mailchimp' ),
 						'<a href="' . esc_url( admin_url( 'admin.php?page=mailchimp_sf_options' ) ) . '">',
 						'</a>'
 					);
@@ -737,4 +738,38 @@ public function get_countries() {
 			'ZW' => __( 'Zimbabwe', 'mailchimp' ),
 		);
 	}
+
+	/**
+	 * Display the Mailchimp footer text on the Mailchimp admin pages.
+	 *
+	 * @since x.x.x
+	 *
+	 * @param string $text The current footer text.
+	 * @return string The modified footer text.
+	 */
+	public function admin_footer_text( $text ) {
+		$current_screen    = get_current_screen();
+		$current_screen_id = $current_screen ? $current_screen->id : '';
+		if ( ! in_array( $current_screen_id, array( 'toplevel_page_mailchimp_sf_options', 'admin_page_mailchimp_sf_create_account' ), true ) ) {
+			return $text;
+		}
+
+		return wp_kses(
+			sprintf(
+				/* translators: %d - Current year, %s - Mailchimp legal links */
+				__( '©%1$d Intuit Inc. All rights reserved. Mailchimp® is a registered trademark of The Rocket Science Group, <a href="%2$s" target="_blank" rel="noopener noreferrer">Cookie Preferences</a>, <a href="%3$s" target="_blank" rel="noopener noreferrer">Privacy</a>, and <a href="%4$s" target="_blank" rel="noopener noreferrer">Terms</a>.', 'mailchimp' ),
+				gmdate( 'Y' ),
+				esc_url( 'https://mailchimp.com/legal/cookies/#optanon-toggle-display/' ),
+				esc_url( 'https://www.intuit.com/privacy/statement/' ),
+				esc_url( 'https://mailchimp.com/legal/terms' ),
+			),
+			array(
+				'a' => array(
+					'href'   => array(),
+					'target' => array(),
+					'rel'    => array(),
+				),
+			)
+		);
+	}
 }