diff options
| author | George Hazan <ghazan@miranda.im> | 2020-03-17 22:52:32 +0300 |
|---|---|---|
| committer | George Hazan <ghazan@miranda.im> | 2020-03-17 22:52:38 +0300 |
| commit | e5158b1b3c71329732dd3625f2ec048c9316df7f (patch) | |
| tree | 490d64fcaf1a4e967f263c50e09468cee25cbbcd /protocols/JabberG/src/jabber_util.cpp | |
| parent | 30d7018e0c6b31ad7a30add2cb127a084333eba5 (diff) | |
Jabber: fix for Chinese in error messages
Diffstat (limited to 'protocols/JabberG/src/jabber_util.cpp')
| -rwxr-xr-x | protocols/JabberG/src/jabber_util.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/protocols/JabberG/src/jabber_util.cpp b/protocols/JabberG/src/jabber_util.cpp index 6e69251042..ec09d029ec 100755 --- a/protocols/JabberG/src/jabber_util.cpp +++ b/protocols/JabberG/src/jabber_util.cpp @@ -284,10 +284,9 @@ CMStringW JabberErrorMsg(const TiXmlElement *errorNode, int *pErrorCode) }
}
+ ret.Format(L"%s %d: %s", TranslateT("Error"), errorCode, TranslateW(JabberErrorStr(errorCode)));
if (str != nullptr)
- ret.Format(L"%s %d: %s\r\n%s", TranslateT("Error"), errorCode, TranslateW(JabberErrorStr(errorCode)), Utf2T(str).get());
- else
- ret.Format(L"%s %d: %s", TranslateT("Error"), errorCode, TranslateW(JabberErrorStr(errorCode)));
+ ret.AppendFormat(L"\r\n%s", Utf2T(str).get());
if (pErrorCode)
*pErrorCode = errorCode;
|