Merge branch 'change-time-format'

1 files changed, 17 insertions, 2 deletions

diff --git a/gui/src/shared/account-expiry.ts b/gui/src/shared/account-expiry.ts
index 8e4c9b2ece..44c62a613e 100644
--- a/gui/src/shared/account-expiry.ts
+++ b/gui/src/shared/account-expiry.ts
@@ -18,11 +18,26 @@ export default class AccountExpiry {
   }
 
   public formattedDate(): string {
-    return this.expiry.format('L LTS');
+    return this.expiry.format('lll');
   }
 
   public durationUntilExpiry(): string {
-    return this.expiry.fromNow(true);
+    const daysDiff = this.expiry.diff(new Date(), 'days');
+
+    // Below three months we want to show the duration in days. Moments fromNow() method starts
+    // measuring duration in months from 26 days and up.
+    // https://momentjs.com/docs/#/displaying/fromnow/
+    if (daysDiff >= 26 && daysDiff <= 90) {
+      return sprintf(
+        // TRANSLATORS: The remaining time left on the account measured in days.
+        // TRANSLATORS: Available placeholders:
+        // TRANSLATORS: %(duration)s - The remaining time measured in days.
+        messages.pgettext('account-expiry', '%(duration)s days'),
+        { duration: daysDiff },
+      );
+    } else {
+      return this.expiry.fromNow(true);
+    }
   }
 
   public remainingTime(): string {