From 1a7aad11d8633d43788b3c5ad524d53c409dfac0 Mon Sep 17 00:00:00 2001
From: Laurent Mazet <mazet@softndesign.org>
Date: Tue, 5 May 2020 08:30:39 +0200
Subject: [PATCH] fixes from MR comments

---
 public/trivabble.js        |  6 +++---
 server/{ => lang}/de.js    |  2 +-
 server/{ => lang}/en.js    |  2 +-
 server/{ => lang}/es.js    |  2 +-
 server/{ => lang}/fr.js    |  2 +-
 server/trivabble-server.js | 16 ++++++++--------
 6 files changed, 15 insertions(+), 15 deletions(-)
 rename server/{ => lang}/de.js (99%)
 rename server/{ => lang}/en.js (99%)
 rename server/{ => lang}/es.js (99%)
 rename server/{ => lang}/fr.js (99%)

diff --git a/public/trivabble.js b/public/trivabble.js
index 34a9330..21a3eff 100644
--- a/public/trivabble.js
+++ b/public/trivabble.js
@@ -542,8 +542,8 @@
                 document.getElementById("number").textContent = localStorage.trivabbleGameNumber = value;
                 break;
             case "boardLang":
-                document.getElementById("board-lang").textContent =
-                    langName[localStorage.trivabbleBoardLang = value];
+                localStorage.trivabbleBoardLang = value;
+                document.getElementById("board-lang").textContent = langName[value];
                 break;
         }
     }
@@ -1339,7 +1339,7 @@
 
     function changeBoardLang(lang) {
         myConfirm(
-            _("Are you sure you want to change board to '" + langName[lang] + "'? This will put all the tiles back in the bag an start another game."),
+            format(_("Are you sure you want to change board to '{0}'? This will put all the tiles back in the bag and start another game."), langName[lang]),
             function () {
                 sendCmds([{cmd: "changeBoard", lang: lang}]);
             }
diff --git a/server/de.js b/server/lang/de.js
similarity index 99%
rename from server/de.js
rename to server/lang/de.js
index 2a0f454..9e9e4b9 100644
--- a/server/de.js
+++ b/server/lang/de.js
@@ -69,7 +69,7 @@ module.exports = {
     "Y"
   ],
 
-  values: {
+  letterValues: {
     " ": 0,
     "E": 1,
     "N": 1,
diff --git a/server/en.js b/server/lang/en.js
similarity index 99%
rename from server/en.js
rename to server/lang/en.js
index 26f9894..d118e9d 100644
--- a/server/en.js
+++ b/server/lang/en.js
@@ -65,7 +65,7 @@ module.exports = {
     "Z"
   ],
 
-  values: {
+  letterValues: {
     " ": 0,
     "E": 1,
     "A": 1,
diff --git a/server/es.js b/server/lang/es.js
similarity index 99%
rename from server/es.js
rename to server/lang/es.js
index 69b2ead..6a94781 100644
--- a/server/es.js
+++ b/server/lang/es.js
@@ -67,7 +67,7 @@ module.exports = {
     "Z"
   ],
 
-  values: {
+  letterValues: {
     " ": 0,
     "A": 1,
     "E": 1,
diff --git a/server/fr.js b/server/lang/fr.js
similarity index 99%
rename from server/fr.js
rename to server/lang/fr.js
index 744e1f9..06ae809 100644
--- a/server/fr.js
+++ b/server/lang/fr.js
@@ -64,7 +64,7 @@ module.exports = {
     "Z"
   ],
 
-  values: {
+  letterValues: {
     " ": 0,
     "E": 1,
     "A": 1,
diff --git a/server/trivabble-server.js b/server/trivabble-server.js
index 6653974..5710505 100644
--- a/server/trivabble-server.js
+++ b/server/trivabble-server.js
@@ -59,10 +59,10 @@ const REQUEST_TYPE_WEBSOCKET    = 3;
 
 /* Manage multi language board */
 const boardPieces = {
-    "de": require ("./de.js"),
-    "en": require ("./en.js"),
-    "es": require ("./es.js"),
-    "fr": require ("./fr.js")
+    "de": require ("./lang/de.js"),
+    "en": require ("./lang/en.js"),
+    "es": require ("./lang/es.js"),
+    "fr": require ("./lang/fr.js")
 };
 const defaultLang = "fr";
 
@@ -214,7 +214,7 @@ Game.prototype.init = function (lang) {
     this.board = newBoard();
     this.lang = lang || defaultLang;
     this.bag = boardPieces[this.lang].bag.slice();
-    this.values = boardPieces[this.lang].values;
+    this.letterValues = boardPieces[this.lang].letterValues;
     this.racks = {};
     this.scores = {};
     this.lastUpdated = new Date();
@@ -240,7 +240,7 @@ Game.fromJSON = function (obj) {
     game.board            = obj.board  || newBoard();
     game.lang             = obj.lang   || defaultLang;
     game.bag              = boardPieces[game.lang].bag.slice();
-    game.values           = boardPieces[game.lang].values;
+    game.letterValues     = boardPieces[game.lang].letterValues;
     game.racks            = obj.racks  || {};
     game.scores           = obj.scores || {};
     game.lastUpdated      = obj.lastUpdated ? new Date(obj.lastUpdated) : new Date();
@@ -479,7 +479,7 @@ function handleCommand(cmdNumber, message, response) {
                 rack: game.getPlayerRack(playerName),
                 board: game.board,
                 remainingLetters: game.bag.length,
-                letterValues: game.values,
+                letterletterValues: game.letterValues,
                 version: VERSION
             });
             break;
@@ -704,7 +704,7 @@ function handleCommands(message, responseAndType) {
                 currentPlayer:    game.currentPlayer,
                 gameNumber:       gameNumber,
                 boardLang:        game.lang,
-                letterValues:     game.values,
+                letterValues:     game.letterValues,
                 rack:             game.getPlayerRack(message.playerName),
                 board:            game.board,
                 remainingLetters: game.bag.length,
-- 
2.30.2