Merge remote-tracking branch 'strangerstudios/dev' into dev

strangerstudios · Sep 18, 2024 · 107468c · 107468c
2 parents 9e912e3 + 0dd629e
commit 107468c
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/classes/class-pmpro-subscription.php b/classes/class-pmpro-subscription.php
@@ -1010,10 +1010,10 @@ public function get_orders( array $args = [] ) {
 	public function get_cost_text() {
 		if  ( 1 == $this->cycle_number ) {
 			// translators: %1$s - price, %2$s - period.
-			$cost_text = sprintf( __( '%1$s per %2$s', 'paid-memberships-pro' ), pmpro_formatPrice( $this->billing_amount ), $this->cycle_period );
+			$cost_text = sprintf( __( '%1$s per %2$s', 'paid-memberships-pro' ), pmpro_formatPrice( $this->billing_amount ), pmpro_translate_billing_period( $this->cycle_period, $this->cycle_number ) );
 		} else {
 			// translators: %1$s - price, %2$d - number, %3$s - period.
-			$cost_text = sprintf( __( '%1$s every %2$d %3$s', 'paid-memberships-pro' ), pmpro_formatPrice( $this->billing_amount ), $this->cycle_number, $this->cycle_period );
+			$cost_text = sprintf( __( '%1$s every %2$d %3$s', 'paid-memberships-pro' ), pmpro_formatPrice( $this->billing_amount ), $this->cycle_number, pmpro_translate_billing_period( $this->cycle_period, $this->cycle_number ) );
 		}
 
 		/**

diff --git a/includes/profile.php b/includes/profile.php
@@ -1114,7 +1114,8 @@ function pmpro_member_profile_edit_form() {
 			wp_update_user( $user );
 			?>
 			<div role="alert" class="<?php echo esc_attr( pmpro_get_element_class( 'pmpro_message pmpro_success', 'pmpro_success' ) ); ?>">
-				<?php echo sprintf( wp_kses_post( 'Your profile has been updated. <a href="%s">View Your Membership Account &rarr;</a>', 'paid-memberships-pro' ), esc_url( pmpro_url( 'account' ) ) ); ?>
+				<?php esc_html_e( 'Your profile has been updated.', 'paid-memberships-pro' ); ?>
+				<a href="<?php echo esc_url( pmpro_url( 'account' ) ); ?>"><?php esc_html_e( 'View Your Membership Account &rarr;', 'paid-memberships-pro' ); ?></a>
 			</div>
 		<?php }
 	} else {