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 (file)
--- a/winboard/jaws.c
+++ b/winboard/jaws.c
@@ -127,7 +127,7 @@ char* PieceToName(p, i)
         int black = (p >= BlackPawn);\r
         if(black) p -= BlackPawn;\r
         sprintf(buf, i ? black ? "Black " : "White " : "");\r
-        sprintf(buf + strlen(buf), " %s", pieceTypeName[(int) p]);\r
+        sprintf(buf + strlen(buf), "%s", pieceTypeName[(int) p]);\r
                return T_(buf);\r
 }\r
 \r

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