From b3486ce61427a2b708f78f1f52e156e1b6a8eebe Mon Sep 17 00:00:00 2001
From: Rishabh04-02 <rishabh0402@gmail.com>
Date: Thu, 5 Oct 2017 10:44:12 +0530
Subject: [PATCH] displaying time in X minutes Y seconds

---
 .../src/components/CountdownSeconds.js         | 18 ++++++++++++++----
 locales/en.yml                                 |  2 ++
 locales/es.yml                                 |  2 ++
 locales/fr.yml                                 |  2 ++
 locales/pt_BR.yml                              |  2 ++
 5 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/client/coral-embed-stream/src/components/CountdownSeconds.js b/client/coral-embed-stream/src/components/CountdownSeconds.js
index 789b674b5..abcc1e398 100644
--- a/client/coral-embed-stream/src/components/CountdownSeconds.js
+++ b/client/coral-embed-stream/src/components/CountdownSeconds.js
@@ -35,16 +35,26 @@ export class CountdownSeconds extends React.Component {
     const {until, classNameForMsRemaining} = this.props;
     const msRemaining = until - now;
     const secRemaining = msRemaining / 1000;
-    const wholeSecRemaining = Math.floor(secRemaining);
-    const plural = secRemaining !== 1;
-    const units = t(plural ? 'edit_comment.seconds_plural' : 'edit_comment.second');
+    const minRemaining = secRemaining / 60;
+    const secToMinRemaining = secRemaining % 60;
+    const wholeMinRemaining = Math.floor(minRemaining);
+    const wholeSecRemaining = Math.floor(secToMinRemaining);
+    const secUnit = t(wholeSecRemaining !== 1 ? 'edit_comment.seconds_plural' : 'edit_comment.second');
+    const minUnit = t(wholeMinRemaining !== 1 ? 'edit_comment.minutes_plural' : 'edit_comment.minute');
     let classFromProp;
     if (typeof classNameForMsRemaining === 'function') {
       classFromProp = classNameForMsRemaining(msRemaining);
     }
+    if (wholeMinRemaining > 0) {
+      return (
+        <span className={classFromProp}>
+          {`${wholeMinRemaining} ${minUnit} ${wholeSecRemaining} ${secUnit}`}
+        </span>
+      );
+    }
     return (
       <span className={classFromProp}>
-        {`${wholeSecRemaining} ${units}`}
+        {`${wholeSecRemaining} ${secUnit}`}
       </span>
     );
   }
diff --git a/locales/en.yml b/locales/en.yml
index a979739b5..836239fc4 100644
--- a/locales/en.yml
+++ b/locales/en.yml
@@ -172,6 +172,8 @@ en:
     edit_window_timer_prefix: "Edit Window: "
     second: "second"
     seconds_plural: "seconds"
+    minute: "minute"
+    minutes_plural: "minutes"
   email:
     confirm:
       has_been_requested: "A email confirmation has been requested for the following account:"
diff --git a/locales/es.yml b/locales/es.yml
index e9844667d..e21fc274c 100644
--- a/locales/es.yml
+++ b/locales/es.yml
@@ -171,6 +171,8 @@ es:
     edit_window_timer_prefix: "Ventana Edición:"
     second: "segundo"
     seconds_plural: "segundos"
+    minute: "minuto"
+    minutes_plural: "minutos"
   email:
     confirm:
       has_been_requested: "Un correo de confirmación ha sido pedido para la siguiente cuenta:"
diff --git a/locales/fr.yml b/locales/fr.yml
index f8ff403e7..f703c87f1 100644
--- a/locales/fr.yml
+++ b/locales/fr.yml
@@ -140,6 +140,8 @@ fr:
     edit_window_timer_prefix: "Fenêtre d'édition :"
     second: "seconde"
     seconds_plural: "secondes"
+    minute: "minute"
+    minutes_plural: "minutes"
     unexpected_error: "Erreur inattendue lors de l'enregistrement des modifications. Désolé !"
   embedlink:
     copy: "Copier dans le presse-papier"
diff --git a/locales/pt_BR.yml b/locales/pt_BR.yml
index 3f2c92628..c8a58f77a 100644
--- a/locales/pt_BR.yml
+++ b/locales/pt_BR.yml
@@ -163,6 +163,8 @@ pt_BR:
     edit_window_timer_prefix: "Para editar:"
     second: "segundo"
     seconds_plural: "segundos"
+    minute: "minuto"
+    minutes_plural: "minutos"
   email:
     confirm:
       has_been_requested: "Uma confirmação de e-mail foi solicitada para a seguinte conta:"