From 3960e9d51e1b7c5368d23a5fe0dfccc6f7d08976 Mon Sep 17 00:00:00 2001
From: Laurent Mazet <mazet@softndesign.org>
Date: Sat, 29 Aug 2020 22:23:45 +0200
Subject: [PATCH] change timer format

---
 l10n/po/fr/trivabble.po | 10 ++++++++--
 l10n/pot/trivabble.pot  |  8 +++++++-
 public/trivabble.js     | 11 +++++------
 3 files changed, 20 insertions(+), 9 deletions(-)

diff --git a/l10n/po/fr/trivabble.po b/l10n/po/fr/trivabble.po
index c9d4040..1032356 100644
--- a/l10n/po/fr/trivabble.po
+++ b/l10n/po/fr/trivabble.po
@@ -178,8 +178,14 @@ msgstr "Temps du tour :"
 msgid  "Global timer:"
 msgstr "Temp global :"
 
-msgid  "{0}d {1}h {2}m {3}s"
-msgstr "{0}j {1}h {2}m {3}s"
+msgid  "{0}d"
+msgstr "{0}j"
+
+msgid  "{0}h"
+msgstr "{0}h"
+
+msgid  "{0}' {1}''"
+msgstr "{0}' {1}''"
 
 msgid  "Enable timer"
 msgstr "Activer le timer"
diff --git a/l10n/pot/trivabble.pot b/l10n/pot/trivabble.pot
index a078c0e..80ce381 100644
--- a/l10n/pot/trivabble.pot
+++ b/l10n/pot/trivabble.pot
@@ -184,7 +184,13 @@ msgstr ""
 msgid  "Global timer:"
 msgstr ""
 
-msgid  "{0}d {1}h {2}m {3}s"
+msgid  "{0}d"
+msgstr ""
+
+msgid  "{0}h"
+msgstr ""
+
+msgid  "{0}' {1}''"
 msgstr ""
 
 msgid  "Enable timer"
diff --git a/public/trivabble.js b/public/trivabble.js
index 695e858..ffcc07c 100644
--- a/public/trivabble.js
+++ b/public/trivabble.js
@@ -51,11 +51,8 @@
 
     const trivabble = window.trivabble = {l10n: _};
 
-    function format(s, ...v) {
-        for (let i = 0; i < v.length; i++) {
-            s = s.replace("{" + i + "}", v[i]);
-        }
-        return s;
+    function format(s, v1, v2) {
+        return s.replace("{0}", v1).replace("{1}", v2);
     }
 
     let board;
@@ -1527,7 +1524,9 @@
         const h = Math.floor((delta % (60 * 60 * 24)) / (60 * 60));
         const m = Math.floor((delta % (60 * 60)) / 60);
         const s = Math.floor(delta % 60);
-        return format(_("{0}d {1}h {2}m {3}s"), d, h, m, s);
+        return ((d > 0) ? format(_("{0}d "), d) : "") +
+               ((h > 0) ? format(_("{0}h "), h) : "") +
+               format(_("{0}' {1}''"), m, s);
     }
 
     function initTimer() {
-- 
2.30.2