From: Laurent Mazet <mazet@softndesign.org>
Date: Tue, 8 Dec 2020 20:18:01 +0000 (+0100)
Subject: stylish timers
X-Git-Url: https://secure.softndesign.org/git/?a=commitdiff_plain;h=94feed71b6cfa9a0861eb4c3ea1e69546bfdc0f2;p=trivabble.git

stylish timers
---

diff --git a/l10n/po/fr/trivabble.po b/l10n/po/fr/trivabble.po
index 4ee0c1a..35225d4 100644
--- a/l10n/po/fr/trivabble.po
+++ b/l10n/po/fr/trivabble.po
@@ -244,20 +244,20 @@ msgstr "La vérification orthographique n'est pas disponible dans cette langue."
 msgid "Score new words"
 msgstr "Compter les points"
 
-msgid  "Turn timer:"
-msgstr "Temps du tour :"
+msgid  "Turn:"
+msgstr "Tour :"
 
-msgid  "Game timer:"
-msgstr "Temp global :"
+msgid  "Game:"
+msgstr "Partie :"
 
 msgid  "{0}d"
 msgstr "{0}j"
 
-msgid  "{0}h"
-msgstr "{0}h"
+msgid  "{0}h {0}' {1}''"
+msgstr "{0} h {0} min {1} s"
 
 msgid  "{0}' {1}''"
-msgstr "{0}' {1}''"
+msgstr "{0} min {1}"
 
 msgid  "Enable timer"
 msgstr "Activer le timer"
diff --git a/l10n/pot/trivabble.pot b/l10n/pot/trivabble.pot
index afbd73b..030ffe0 100644
--- a/l10n/pot/trivabble.pot
+++ b/l10n/pot/trivabble.pot
@@ -249,16 +249,16 @@ msgstr ""
 msgid "Score new words"
 msgstr ""
 
-msgid  "Turn timer:"
+msgid  "Turn:"
 msgstr ""
 
-msgid  "Game timer:"
+msgid  "Game:"
 msgstr ""
 
 msgid  "{0}d"
 msgstr ""
 
-msgid  "{0}h"
+msgid  "{0}h {0}' {1}''"
 msgstr ""
 
 msgid  "{0}' {1}''"
diff --git a/public/index.html b/public/index.html
index a95ecf2..bdef669 100644
--- a/public/index.html
+++ b/public/index.html
@@ -118,10 +118,10 @@
                 <button id="btn-settings" data-l10n="text-content">Settings</button>
             </div>
             <p id="timer" style="display:none">
-                <span data-l10n="text-content">Turn timer:</span>
+                <span data-l10n="text-content" class="timer-turn">Turn:</span>
                 <span id="timer-turn">0</span>
                 <br />
-                <span data-l10n="text-content">Game timer:</span>
+                <span data-l10n="text-content" class="timer-game">Game:</span>
                 <span id="timer-game">0</span>
             </p>
             <div id="bag"></div>
diff --git a/public/trivabble.css b/public/trivabble.css
index 8516d48..fc1d491 100644
--- a/public/trivabble.css
+++ b/public/trivabble.css
@@ -733,6 +733,14 @@ button#next-help-msg:hover {
     flex-direction:column;
 }
 
-#timer {
+#timer-turn, .timer-turn {
     text-align: center;
+    font-size: small;
+    color: #333;
+}
+
+#timer-game, .timer-game {
+    text-align: center;
+    font-size: x-small;
+    color: #AAA;
 }
diff --git a/public/trivabble.js b/public/trivabble.js
index c95147e..1d82599 100644
--- a/public/trivabble.js
+++ b/public/trivabble.js
@@ -2237,8 +2237,7 @@
         const m = Math.floor((delta % (60 * 60)) / 60);
         const s = Math.floor(delta % 60);
         return ((d > 0) ? format(_("{0}d "), d) : "") +
-               ((h > 0) ? format(_("{0}h "), h) : "") +
-               format(_("{0}' {1}''"), m, s);
+            ((h > 0) ? format(_("{0}h {1}' {2}''"), h, m, s) : format(_("{0}' {1}''"), m, s));
     }
 
     function timerDate() {