diff --git a/client-mu-plugins/goodbids/src/classes/Core.php b/client-mu-plugins/goodbids/src/classes/Core.php index f57f2686..200a1ca0 100644 --- a/client-mu-plugins/goodbids/src/classes/Core.php +++ b/client-mu-plugins/goodbids/src/classes/Core.php @@ -314,8 +314,7 @@ private function load_config(): bool { if ( empty( $local['version'] ) || version_compare( $json['version'], $local['version'], '!=' ) ) { Log::warning( 'Local config file version mismatch.' ); } - - $json = array_merge_recursive( $json, $local ); + $json = array_merge( $json, $local ); } } diff --git a/client-mu-plugins/goodbids/src/classes/Plugins/WooCommerce/Emails/AuctionIsEndingSoon.php b/client-mu-plugins/goodbids/src/classes/Plugins/WooCommerce/Emails/AuctionIsEndingSoon.php index 6ea440f5..f9bbf545 100644 --- a/client-mu-plugins/goodbids/src/classes/Plugins/WooCommerce/Emails/AuctionIsEndingSoon.php +++ b/client-mu-plugins/goodbids/src/classes/Plugins/WooCommerce/Emails/AuctionIsEndingSoon.php @@ -50,9 +50,9 @@ public function __construct() { /** * Trigger this email when an Auction is within 4 hours of closing - * + * * @since 1.0.0 - * + * * @return void */ private function cron_check_for_auctions_ending_soon(): void { @@ -60,10 +60,11 @@ private function cron_check_for_auctions_ending_soon(): void { Auctions::CRON_AUCTION_ENDING_SOON_CHECK_HOOK, function (): void { $auctions = goodbids()->auctions->get_auctions_ending_soon_emails(); - if (! $auctions){ + if ( ! $auctions ) { return; } - foreach ($auctions as $auction_id){ + + foreach ( $auctions as $auction_id ) { $auction = goodbids()->auctions->get( $auction_id ); $this->send_to_bidders( $auction ); $this->send_to_watchers( $auction ); @@ -118,5 +119,4 @@ public function get_button_url(): string { return '{auction.url}'; } - } diff --git a/client-mu-plugins/goodbids/views/parts/auction.php b/client-mu-plugins/goodbids/views/parts/auction.php index 66fc2a5b..655cc6b7 100644 --- a/client-mu-plugins/goodbids/views/parts/auction.php +++ b/client-mu-plugins/goodbids/views/parts/auction.php @@ -28,8 +28,12 @@ } $remaining_time = $current_date->diff( $end_date ); - $time = __( 'Ending ', 'goodbids' ) . $auction->get_end_date_time( 'M d' ) . ' if nobody else bids'; - + $time = sprintf( + '%s %s %s', + __( 'Ending', 'goodbids' ), + $auction->get_end_date_time( 'M d' ), + __( 'if nobody else bids', 'goodbids' ) + ); if ( $remaining_time->d < 1 && $remaining_time->h >= 1 ) { $clock_svg = true; diff --git a/client-mu-plugins/goodbids/views/woocommerce/emails/auction-is-ending-soon.php b/client-mu-plugins/goodbids/views/woocommerce/emails/auction-is-ending-soon.php index cd2b4f4f..50e43e64 100644 --- a/client-mu-plugins/goodbids/views/woocommerce/emails/auction-is-ending-soon.php +++ b/client-mu-plugins/goodbids/views/woocommerce/emails/auction-is-ending-soon.php @@ -41,7 +41,7 @@ // After. sprintf( - /* translators: %1$s: Site Title, Reward Product Title */ + /* translators: %1$s: Site Title, %2$s: Reward Product Title */ esc_html__( 'to support %1$s\'s mission and place a bid for your chance to win the %2$s!', 'goodbids' ), '{site_title}', '{reward.title}' @@ -54,11 +54,10 @@ %s %s', - /* translators: %1$s: Auction total raised, %2$s: current high bid */ - esc_html__( 'We\ve already raised', 'goodbids' ), + esc_html__( 'We\'ve already raised', 'goodbids' ), '{auction.total_raised}', esc_html__( 'and the', 'goodbids' ), - esc_html__( 'current high bid is ', 'goodbids' ), + esc_html__( 'current high bid is', 'goodbids' ), '{auction.high_bid}' ); ?> diff --git a/client-mu-plugins/goodbids/views/woocommerce/emails/plain/auction-is-ending-soon.php b/client-mu-plugins/goodbids/views/woocommerce/emails/plain/auction-is-ending-soon.php index f7a8e314..0945b606 100644 --- a/client-mu-plugins/goodbids/views/woocommerce/emails/plain/auction-is-ending-soon.php +++ b/client-mu-plugins/goodbids/views/woocommerce/emails/plain/auction-is-ending-soon.php @@ -30,9 +30,9 @@ echo "\n\n----------------------------------------\n\n"; -esc_html_e( 'Auction', 'goodbids' ) . ': ' . '{auction.title}' . "\n"; -esc_html_e( 'Total Raised', 'goodbids' ) . ': ' . '{auction.total_raised}' . "\n"; -esc_html_e( 'High Bid', 'goodbids' ) . ': ' . '{auction.high_bid}' . "\n"; +echo esc_html__( 'Auction', 'goodbids' ) . ': {auction.title}' . "\n"; +echo esc_html__( 'Total Raised', 'goodbids' ) . ': {auction.total_raised}' . "\n"; +echo esc_html__( 'High Bid', 'goodbids' ) . ': {auction.high_bid}' . "\n"; echo "\n\n----------------------------------------\n\n";