Use WP's date format instead of a hard-coded one [PREMIUM-4]

lib/API/Endpoints/v1/Services.php

@@ -6,14 +6,17 @@ use MailPoet\API\Endpoint as APIEndpoint;
 use MailPoet\API\Error as APIError;
 use MailPoet\Services\Bridge;
 use MailPoet\Util\License\License;
+use MailPoet\WP\DateTime;
 
 if(!defined('ABSPATH')) exit;
 
 class Services extends APIEndpoint {
   public $bridge;
+  public $date_time;
 
   function __construct() {
     $this->bridge = new Bridge();
+    $this->date_time = new DateTime();
   }
 
   function verifyMailPoetKey($data = array()) {
@@ -42,7 +45,7 @@ class Services extends APIEndpoint {
       $success_message = sprintf(
         __('Your MailPoet key expires on %s!', 'mailpoet'),
         Carbon::createFromTimestamp(strtotime($result['data']['expire_at']))
-          ->format('Y-m-d')
+          ->format($this->date_time->getDateFormat())
       );
     }
 
@@ -92,7 +95,7 @@ class Services extends APIEndpoint {
       $success_message = sprintf(
         __('Your license key expires on %s.', 'mailpoet'),
         Carbon::createFromTimestamp(strtotime($result['data']['expire_at']))
-          ->format('Y-m-d')
+          ->format($this->date_time->getDateFormat())
       );
     }
 

lib/Config/ServicesChecker.php

@@ -6,6 +6,7 @@ use MailPoet\Models\Subscriber;
 use MailPoet\Services\Bridge;
 use MailPoet\Util\Helpers;
 use MailPoet\Util\License\License;
+use MailPoet\WP\DateTime;
 use MailPoet\WP\Notice as WPNotice;
 
 if(!defined('ABSPATH')) exit;
@@ -34,7 +35,8 @@ class ServicesChecker {
       && !empty($mss_key['data']['expire_at'])
     ) {
       if($display_error_notice) {
-        $date = date('Y-m-d', strtotime($mss_key['data']['expire_at']));
+        $date_time = new DateTime();
+        $date = date($date_time->getDateFormat(), strtotime($mss_key['data']['expire_at']));
         $error = Helpers::replaceLinkTags(
           __('Your newsletters are awesome! Don\'t forget to [link]upgrade your MailPoet email plan[/link] by %s to keep sending them to your subscribers.', 'mailpoet'),
           'https://account.mailpoet.com?s=' . Subscriber::getTotalSubscribers()
@@ -74,7 +76,8 @@ class ServicesChecker {
       && !empty($premium_key['data']['expire_at'])
     ) {
       if($display_error_notice) {
-        $date = date('Y-m-d', strtotime($premium_key['data']['expire_at']));
+        $date_time = new DateTime();
+        $date = date($date_time->getDateFormat(), strtotime($premium_key['data']['expire_at']));
         $error = Helpers::replaceLinkTags(
           __('Your License Key is expiring! Don\'t forget to [link]renew your license[/link] by %s to keep enjoying automatic updates and Premium support.', 'mailpoet'),
           'https://account.mailpoet.com'

tests/unit/API/Endpoints/v1/ServicesTest.php

@@ -49,7 +49,8 @@ class ServicesTest extends MailPoetTest {
     );
     $response = $this->services_endpoint->verifyMailPoetKey($this->data);
     expect($response->status)->equals(APIResponse::STATUS_OK);
-    expect($response->data['message'])->contains($date->format('Y-m-d'));
+    expect($response->data['message'])
+      ->contains($date->format($this->services_endpoint->date_time->getDateFormat()));
   }
 
   function testItRespondsWithErrorIfServiceIsUnavailableDuringMSSCheck() {
@@ -122,7 +123,8 @@ class ServicesTest extends MailPoetTest {
     );
     $response = $this->services_endpoint->verifyPremiumKey($this->data);
     expect($response->status)->equals(APIResponse::STATUS_OK);
-    expect($response->data['message'])->contains($date->format('Y-m-d'));
+    expect($response->data['message'])
+      ->contains($date->format($this->services_endpoint->date_time->getDateFormat()));
   }
 
   function testItRespondsWithErrorIfServiceIsUnavailableDuringPremiumCheck() {