mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

(svn r21004) -Fix [FS#3746]: chat/console messages got sometimes messed up due to LTR names in RTL translations and vice-versa

release/1.1
rubidium 2010-10-21 20:12:48 +00:00
parent a671f64896
commit 87edf2524d
4 changed files with 31 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/console_gui.cpp
View File

@ -285,7 +285,10 @@ struct IConsoleWindow : Window
break; break;
case WKC_RETURN: case WKC_NUM_ENTER: { case WKC_RETURN: case WKC_NUM_ENTER: {
IConsolePrintF(CC_COMMAND, "] %s", _iconsole_cmdline.buf); /* We always want the ] at the left side; we always force these strings to be left
* aligned anyway. So enforce this in all cases by addding a left-to-right marker,
* otherwise it will be drawn at the wrong side with right-to-left texts. */
IConsolePrintF(CC_COMMAND, LRM "] %s", _iconsole_cmdline.buf);
const char *cmd = IConsoleHistoryAdd(_iconsole_cmdline.buf); const char *cmd = IConsoleHistoryAdd(_iconsole_cmdline.buf);
IConsoleClearCommand(); IConsoleClearCommand();

8
src/network/network.cpp
View File

@ -202,7 +202,13 @@ void NetworkTextMessage(NetworkAction action, ConsoleColour colour, bool self_se
SetDParamStr(0, name); SetDParamStr(0, name);
SetDParamStr(1, str); SetDParamStr(1, str);
SetDParam(2, data); SetDParam(2, data);
GetString(message, strid, lastof(message));
/* All of these strings start with "***". These characters are interpreted as both left-to-right and
* right-to-left characters depending on the context. As the next text might be an user's name, the
* user name's characters will influence the direction of the "***" instead of the language setting
* of the game. Manually set the direction of the "***" by inserting a text-direction marker. */
char *msg_ptr = message + Utf8Encode(message, _dynlang.text_dir == TD_LTR ? CHAR_TD_LRM : CHAR_TD_RLM);
GetString(msg_ptr, strid, lastof(message));
DEBUG(desync, 1, "msg: %08x; %02x; %s", _date, _date_fract, message); DEBUG(desync, 1, "msg: %08x; %02x; %s", _date, _date_fract, message);
IConsolePrintF(colour, "%s", message); IConsolePrintF(colour, "%s", message);

13
src/string_type.h
View File

@ -15,6 +15,9 @@
/** A non-breaking space. */ /** A non-breaking space. */
#define NBSP "\xC2\xA0" #define NBSP "\xC2\xA0"
/** A left-to-right marker, marks the next character as left-to-right. */
#define LRM "\xE2\x80\x8E"
/** /**
* Valid filter types for IsValidChar. * Valid filter types for IsValidChar.
*/ */
@ -28,4 +31,14 @@ enum CharSetFilter {
typedef uint32 WChar; typedef uint32 WChar;
/* The following are directional formatting codes used to get the LTR and RTL strings right:
* http://www.unicode.org/unicode/reports/tr9/#Directional_Formatting_Codes */
static const WChar CHAR_TD_LRM = 0x200E; ///< The next character acts like a left-to-right character.
static const WChar CHAR_TD_RLM = 0x200F; ///< The next character acts like a right-to-left character.
static const WChar CHAR_TD_LRE = 0x202A; ///< The following text is embedded left-to-right.
static const WChar CHAR_TD_RLE = 0x202B; ///< The following text is embedded right-to-left.
static const WChar CHAR_TD_LRO = 0x202D; ///< Force the following characters to be treated as left-to-right characters.
static const WChar CHAR_TD_RLO = 0x202E; ///< Force the following characters to be treated as right-to-left characters.
static const WChar CHAR_TD_PDF = 0x202C; ///< Restore the text-direction state to before the last LRE, RLE, LRO or RLO.
#endif /* STRING_TYPE_H */ #endif /* STRING_TYPE_H */

14
src/table/strgen_tables.h
View File

@ -137,13 +137,13 @@ static const CmdStruct _cmd_structs[] = {
/* The following are directional formatting codes used to get the RTL strings right: /* The following are directional formatting codes used to get the RTL strings right:
* http://www.unicode.org/unicode/reports/tr9/#Directional_Formatting_Codes */ * http://www.unicode.org/unicode/reports/tr9/#Directional_Formatting_Codes */
{"LRM", EmitSingleChar, 0x200E, 0, C_DONTCOUNT}, {"LRM", EmitSingleChar, CHAR_TD_LRM, 0, C_DONTCOUNT},
{"RLM", EmitSingleChar, 0x200F, 0, C_DONTCOUNT}, {"RLM", EmitSingleChar, CHAR_TD_RLM, 0, C_DONTCOUNT},
{"LRE", EmitSingleChar, 0x202A, 0, C_DONTCOUNT}, {"LRE", EmitSingleChar, CHAR_TD_LRE, 0, C_DONTCOUNT},
{"RLE", EmitSingleChar, 0x202B, 0, C_DONTCOUNT}, {"RLE", EmitSingleChar, CHAR_TD_RLE, 0, C_DONTCOUNT},
{"LRO", EmitSingleChar, 0x202D, 0, C_DONTCOUNT}, {"LRO", EmitSingleChar, CHAR_TD_LRO, 0, C_DONTCOUNT},
{"RLO", EmitSingleChar, 0x202E, 0, C_DONTCOUNT}, {"RLO", EmitSingleChar, CHAR_TD_RLO, 0, C_DONTCOUNT},
{"PDF", EmitSingleChar, 0x202C, 0, C_DONTCOUNT}, {"PDF", EmitSingleChar, CHAR_TD_PDF, 0, C_DONTCOUNT},
}; };
/** Description of a plural form */ /** Description of a plural form */