Translate spoken pieces and coordinates in accessible version

diff --git a/winboard/jaws.c b/winboard/jaws.c
index 42c203f..502b10f 100644 (file)
--- a/winboard/jaws.c
+++ b/winboard/jaws.c
@@ -128,19 +128,19 @@ char* PieceToName(p, i)
         if(black) p -= BlackPawn;\r
         sprintf(buf, i ? black ? "Black " : "White " : "");\r
         snprintf(buf + strlen(buf), " %s", pieceTypeName[(int) p]);\r
-               return buf;\r
+               return T_(buf);\r
 }\r
 \r
 char* SquareToChar(x)\r
                        int x;\r
 {\r
-               return squareToChar[x - BOARD_LEFT];\r
+               return T_(squareToChar[x - BOARD_LEFT]);\r
 }\r
 \r
 char* SquareToNum(y)\r
                        int y;\r
 {\r
-               return squareToNum[y + (gameInfo.boardHeight != 10)];\r
+               return T_(squareToNum[y + (gameInfo.boardHeight != 10)]);\r
 }\r
 \r
 \r
@@ -359,7 +359,7 @@ KeyboardEvent(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
                if(currentPiece != EmptySquare) {\r
                        char buf[MSG_SIZ];\r
                        n = boards[currentMove][fromY][1];\r
-                       snprintf(buf, MSG_SIZ, "%d %s%s", n, T_(PieceToName(currentPiece,0)), n == 1 ? "" : "s");\r
+                       snprintf(buf, MSG_SIZ, "%d %s%s", n, PieceToName(currentPiece,0), n == 1 ? "" : "s");\r
                        SayString(buf, FALSE);\r
                }\r
                SayString(" ", TRUE);\r
@@ -369,7 +369,7 @@ KeyboardEvent(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
                if(currentPiece != EmptySquare) {\r
                        char buf[MSG_SIZ];\r
                        n = boards[currentMove][fromY][BOARD_WIDTH-2];\r
-                       snprintf(buf, MSG_SIZ,"%d %s%s", n, T_(PieceToName(currentPiece,0)), n == 1 ? "" : "s");\r
+                       snprintf(buf, MSG_SIZ,"%d %s%s", n, PieceToName(currentPiece,0), n == 1 ? "" : "s");\r
                        SayString(buf, FALSE);\r
                }\r
                SayString(" ", TRUE);\r
@@ -379,8 +379,8 @@ KeyboardEvent(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
                xchar = SquareToChar(fromX);\r
                ynum = SquareToNum(fromY);\r
                if(currentPiece != EmptySquare) {\r
-                 snprintf(buf, MSG_SIZ, "%s %s %s", T_(xchar), T_(ynum), T_(piece));\r
-               } else snprintf(buf, MSG_SIZ, "%s %s", T_(xchar), T_(ynum));\r
+                 snprintf(buf, MSG_SIZ, "%s %s %s", xchar, ynum, piece);\r
+               } else snprintf(buf, MSG_SIZ, "%s %s", xchar, ynum);\r
                SayString(buf, FALSE);\r
                SayString(" ", TRUE);\r
        }\r