Reset the chat history when resetting the game

Suggested by a user.

diff --git a/l10n/po/fr/trivabble.po b/l10n/po/fr/trivabble.po
index 4306a19c899e3a9b860601e8fbbbf5ff1773305b..5cfc7cc5615d85da0b8517c3cc545a1e15fd82e8 100644 (file)
--- a/l10n/po/fr/trivabble.po
+++ b/l10n/po/fr/trivabble.po
@@ -28,8 +28,8 @@ msgstr "Pour changer de nom, saisissez-en un nouveau. Vous pouvez continuer à u
 msgid  "You cannot take another tile: your rack is full."
 msgstr "Vous ne pouvez pas tirer de pièce : votre chevalet est complet."
 
-msgid  "Are you sure you want to put all the tiles back in the bag (in order to play another game)?"
-msgstr "Êtes-vous sûr·e de vouloir remettre toutes les lettres du jeu dans le sac (en vue de jouer une nouvelle partie) ?"
+msgid  "Are you sure you want to put all the tiles back in the bag (in order to play another game)? This will also clear the chat history."
+msgstr "Êtes-vous sûr·e de vouloir remettre toutes les lettres du jeu dans le sac (en vue de jouer une nouvelle partie) ? Cela remettra également l'historique du chat à zéro."
 
 msgid  "Are you sure you want to put all your tiles back in the bag?"
 msgstr "Êtes-vous sûr·e de vouloir remettre toutes vos lettres dans le sac ?"

diff --git a/l10n/pot/trivabble.pot b/l10n/pot/trivabble.pot
index 98d1812dde5b85628f72593d0cbe9724de302571..2cb91f9feedb3cf5115b8bb8bb73b79597ade28a 100644 (file)
--- a/l10n/pot/trivabble.pot
+++ b/l10n/pot/trivabble.pot
@@ -30,7 +30,7 @@ msgstr ""
 msgid  "You cannot take another tile: your rack is full."
 msgstr ""
 
-msgid  "Are you sure you want to put all the tiles back in the bag (in order to play another game)?"
+msgid  "Are you sure you want to put all the tiles back in the bag (in order to play another game)? This will also clear the chat history."
 msgstr ""
 
 msgid  "Are you sure you want to put all your tiles back in the bag?"

diff --git a/public/trivabble.js b/public/trivabble.js
index ae16d6208b9600369a4f78b6c44a3c2a42a3ea4c..bc99c954549ca35990bd6a78cb58c4869ae9d1e5 100644 (file)
--- a/public/trivabble.js
+++ b/public/trivabble.js
@@ -1200,6 +1200,7 @@
 
                 lastPlayer = null;
                 currentTileOwner = {};
+                chatMessages.textContent = "";
                 break;
 
             case "moveLetter":
@@ -1820,7 +1821,7 @@
 
     function clearGame() {
         myConfirm(
-            _("Are you sure you want to put all the tiles back in the bag (in order to play another game)?"),
+            _("Are you sure you want to put all the tiles back in the bag (in order to play another game)? This will also clear the chat history."),
             function () {
                 sendCmds([{cmd: "resetGame"}]);
             }

diff --git a/server/trivabble-server.js b/server/trivabble-server.js
index ec1abae81b45e0d9eefdb3f86aaf436e967ba8d6..3216cbfb316f7f331c5cbb832dfe5edfac6eed54 100644 (file)
--- a/server/trivabble-server.js
+++ b/server/trivabble-server.js
@@ -498,7 +498,7 @@ Game.prototype.bagPushLetter = function (letter, player) {
 };
 
 Game.prototype.reset = function (player) {
-    this.init(this.lang, this.label, this.factor, this.checkFirstWord, this.freezePlayedTiles, this.chatHistory);
+    this.init(this.lang, this.label, this.factor, this.checkFirstWord, this.freezePlayedTiles, []);
     this.pendingEvents.push({
         player: player,
         action: "reset",