From: H.G.Muller <hgm@hgm-xboard.(none)>
Date: Wed, 6 Jul 2022 20:10:08 +0000 (+0200)
Subject: Fix translation issues in JAWS version
X-Git-Url: http://winboard.nl/cgi-bin?a=commitdiff_plain;h=0b9ba1149d454bb452c6b7e8001fc34cb64131c2;p=xboard.git

Fix translation issues in JAWS version

A spurious space was appearing when prefixing piece name with color
for being spoken, which was preventing translation.
Also, single-character messages were not translated, which was bad
for reading the board coordinates.
---

diff --git a/winboard/jaws.c b/winboard/jaws.c
index 59d9880..ef5b18e 100644
--- a/winboard/jaws.c
+++ b/winboard/jaws.c
@@ -127,7 +127,7 @@ char* PieceToName(p, i)
         int black = (p >= BlackPawn);
         if(black) p -= BlackPawn;
         sprintf(buf, i ? black ? "Black " : "White " : "");
-        sprintf(buf + strlen(buf), " %s", pieceTypeName[(int) p]);
+        sprintf(buf + strlen(buf), "%s", pieceTypeName[(int) p]);
 		return T_(buf);
 }
 
diff --git a/winboard/winboard.c b/winboard/winboard.c
index 38280a2..191ac62 100644
--- a/winboard/winboard.c
+++ b/winboard/winboard.c
@@ -365,7 +365,7 @@ LoadLanguageFile(char *name)
             if(languageBuf[n] == '"' && languageBuf[i-1] == '"') {
                 char *p;
                 if(p = strstr(languageBuf + n + 1, "\" === \"")) {
-                    if(p > languageBuf+n+2 && p+8 < languageBuf+i) {
+                    if(p > languageBuf+n+1 && p+8 < languageBuf+i) {
                         if(j >= sizeof(english)) { DisplayError("Too many translated strings", 0); return; }
                         english[j] = languageBuf + n + 1; *p = 0;
                         foreign[j++] = p + 7; languageBuf[i-1] = 0;
@@ -382,6 +382,7 @@ LoadLanguageFile(char *name)
             }
             languageBuf[--i] = k;
 
+
         }
         i++;
     }
@@ -6776,6 +6777,7 @@ TypeInMoveDialog(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
 
       shiftKey = GetKeyState(VK_SHIFT) < 0; // [HGM] remember last shift status
       GetDlgItemText(hDlg, OPT_Move, move, sizeof(move));
+
 #ifdef JAWS
       if(strlen(move) == 1 && !isdigit(*move)) SayPieceType(*move); else
 #endif