From 3adfcb55daa2abde3d668ccce159ea0c60e7984e Mon Sep 17 00:00:00 2001 From: George Hazan Date: Mon, 19 Sep 2016 19:13:58 +0000 Subject: grrrrm... there's no hLangpack in chat items, therefore strings must be translated inside plugins git-svn-id: http://svn.miranda-ng.org/main/trunk@17323 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- protocols/AimOscar/src/chat.cpp | 4 ++-- protocols/FacebookRM/src/chat.cpp | 8 ++++---- protocols/Gadu-Gadu/src/groupchat.cpp | 2 +- protocols/IRCG/src/commandmonitor.cpp | 14 +++++++------- protocols/JabberG/src/jabber_chat.cpp | 2 +- protocols/MRA/src/MraChat.cpp | 2 +- protocols/MSN/src/msn_chat.cpp | 2 +- protocols/MinecraftDynmap/src/chat.cpp | 4 ++-- protocols/Omegle/src/chat.cpp | 4 ++-- protocols/Sametime/src/conference.cpp | 2 +- protocols/SkypeWeb/src/skype_chatrooms.cpp | 4 ++-- protocols/Twitter/src/chat.cpp | 2 +- protocols/VKontakte/src/vk_chats.cpp | 2 +- protocols/WhatsApp/src/chat.cpp | 2 +- protocols/Yahoo/src/chat.cpp | 4 ++-- 15 files changed, 29 insertions(+), 29 deletions(-) (limited to 'protocols') diff --git a/protocols/AimOscar/src/chat.cpp b/protocols/AimOscar/src/chat.cpp index 8189395ca0..bd7a371619 100644 --- a/protocols/AimOscar/src/chat.cpp +++ b/protocols/AimOscar/src/chat.cpp @@ -39,8 +39,8 @@ void CAimProto::chat_start(const char *id, unsigned short exchange) wchar_t *idt = mir_a2u(id); Chat_NewSession(GCW_CHATROOM, m_szModuleName, idt, idt); - Chat_AddGroup(m_szModuleName, idt, LPGENW("Me")); - Chat_AddGroup(m_szModuleName, idt, LPGENW("Others")); + Chat_AddGroup(m_szModuleName, idt, TranslateT("Me")); + Chat_AddGroup(m_szModuleName, idt, TranslateT("Others")); Chat_Control(m_szModuleName, idt, SESSION_INITDONE); Chat_Control(m_szModuleName, idt, SESSION_ONLINE); diff --git a/protocols/FacebookRM/src/chat.cpp b/protocols/FacebookRM/src/chat.cpp index e7e85a10f8..2d288ac103 100644 --- a/protocols/FacebookRM/src/chat.cpp +++ b/protocols/FacebookRM/src/chat.cpp @@ -248,10 +248,10 @@ void FacebookProto::AddChat(const char *id, const wchar_t *tname) Chat_NewSession(GCW_PRIVMESS, m_szModuleName, tid, tname); // Send setting events - Chat_AddGroup(m_szModuleName, tid, LPGENW("Myself")); - Chat_AddGroup(m_szModuleName, tid, LPGENW("Friend")); - Chat_AddGroup(m_szModuleName, tid, LPGENW("User")); - Chat_AddGroup(m_szModuleName, tid, LPGENW("Former")); + Chat_AddGroup(m_szModuleName, tid, TranslateT("Myself")); + Chat_AddGroup(m_szModuleName, tid, TranslateT("Friend")); + Chat_AddGroup(m_szModuleName, tid, TranslateT("User")); + Chat_AddGroup(m_szModuleName, tid, TranslateT("Former")); // Finish initialization bool hideChats = getBool(FACEBOOK_KEY_HIDE_CHATS, DEFAULT_HIDE_CHATS); diff --git a/protocols/Gadu-Gadu/src/groupchat.cpp b/protocols/Gadu-Gadu/src/groupchat.cpp index 3ca980c332..7137639aed 100644 --- a/protocols/Gadu-Gadu/src/groupchat.cpp +++ b/protocols/Gadu-Gadu/src/groupchat.cpp @@ -314,7 +314,7 @@ wchar_t* GGPROTO::gc_getchat(uin_t sender, uin_t *recipients, int recipients_cou Chat_SetStatusbarText(m_szModuleName, chat->id, status); // Add normal group - Chat_AddGroup(m_szModuleName, chat->id, LPGENW("Participants")); + Chat_AddGroup(m_szModuleName, chat->id, TranslateT("Participants")); GCDEST gcd = { m_szModuleName, chat->id, GC_EVENT_JOIN }; GCEVENT gce = { &gcd }; diff --git a/protocols/IRCG/src/commandmonitor.cpp b/protocols/IRCG/src/commandmonitor.cpp index 91e3f2fc9f..c5437208e4 100644 --- a/protocols/IRCG/src/commandmonitor.cpp +++ b/protocols/IRCG/src/commandmonitor.cpp @@ -1270,12 +1270,12 @@ bool CIrcProto::OnIrc_ENDNAMES(const CIrcMessage* pmsg) PostIrcMessage(L"/MODE %s", sChanName); // register the statuses - Chat_AddGroup(m_szModuleName, sID, LPGENW("Owner")); - Chat_AddGroup(m_szModuleName, sID, LPGENW("Admin")); - Chat_AddGroup(m_szModuleName, sID, LPGENW("Op")); - Chat_AddGroup(m_szModuleName, sID, LPGENW("Halfop")); - Chat_AddGroup(m_szModuleName, sID, LPGENW("Voice")); - Chat_AddGroup(m_szModuleName, sID, LPGENW("Normal")); + Chat_AddGroup(m_szModuleName, sID, TranslateT("Owner")); + Chat_AddGroup(m_szModuleName, sID, TranslateT("Admin")); + Chat_AddGroup(m_szModuleName, sID, TranslateT("Op")); + Chat_AddGroup(m_szModuleName, sID, TranslateT("Halfop")); + Chat_AddGroup(m_szModuleName, sID, TranslateT("Voice")); + Chat_AddGroup(m_szModuleName, sID, TranslateT("Normal")); { int k = 0; CMStringW sTemp = GetWord(sNamesList, k); @@ -2323,7 +2323,7 @@ bool CIrcProto::DoOnConnect(const CIrcMessage*) } } - Chat_AddGroup(m_szModuleName, SERVERWINDOW, LPGENW("Normal")); + Chat_AddGroup(m_szModuleName, SERVERWINDOW, TranslateT("Normal")); Chat_Control(m_szModuleName, SERVERWINDOW, SESSION_ONLINE); CallFunctionAsync(sttMainThrdOnConnect, this); diff --git a/protocols/JabberG/src/jabber_chat.cpp b/protocols/JabberG/src/jabber_chat.cpp index b0705bd506..5838b6e2e1 100644 --- a/protocols/JabberG/src/jabber_chat.cpp +++ b/protocols/JabberG/src/jabber_chat.cpp @@ -162,7 +162,7 @@ int CJabberProto::GcInit(JABBER_LIST_ITEM *item) item->bChatActive = true; for (int i = _countof(sttStatuses) - 1; i >= 0; i--) - Chat_AddGroup(m_szModuleName, item->jid, sttStatuses[i]); + Chat_AddGroup(m_szModuleName, item->jid, TranslateW(sttStatuses[i])); Chat_Control(m_szModuleName, item->jid, (item->bAutoJoin && m_options.AutoJoinHidden) ? WINDOW_HIDDEN : SESSION_INITDONE); Chat_Control(m_szModuleName, item->jid, SESSION_ONLINE); diff --git a/protocols/MRA/src/MraChat.cpp b/protocols/MRA/src/MraChat.cpp index dd01c23764..936ebdcb74 100644 --- a/protocols/MRA/src/MraChat.cpp +++ b/protocols/MRA/src/MraChat.cpp @@ -37,7 +37,7 @@ INT_PTR CMraProto::MraChatSessionNew(MCONTACT hContact) return 1; for (int i = 0; i < _countof(lpwszStatuses); i++) - Chat_AddGroup(m_szModuleName, wszEMail, lpwszStatuses[i]); + Chat_AddGroup(m_szModuleName, wszEMail, TranslateW(lpwszStatuses[i])); Chat_Control(m_szModuleName, wszEMail, SESSION_INITDONE); Chat_Control(m_szModuleName, wszEMail, SESSION_ONLINE); diff --git a/protocols/MSN/src/msn_chat.cpp b/protocols/MSN/src/msn_chat.cpp index 775cf2e150..9b1dd2653e 100644 --- a/protocols/MSN/src/msn_chat.cpp +++ b/protocols/MSN/src/msn_chat.cpp @@ -61,7 +61,7 @@ int CMsnProto::MSN_ChatInit(GCThreadData *info, const char *pszID, const char *p Chat_NewSession(GCW_CHATROOM, m_szModuleName, info->mChatID, szName); for (int j = 0; j < _countof(m_ptszRoles); j++) - Chat_AddGroup(m_szModuleName, info->mChatID, m_ptszRoles[j]); + Chat_AddGroup(m_szModuleName, info->mChatID, TranslateW(m_ptszRoles[j])); Chat_Control(m_szModuleName, info->mChatID, SESSION_INITDONE); Chat_Control(m_szModuleName, info->mChatID, SESSION_ONLINE); diff --git a/protocols/MinecraftDynmap/src/chat.cpp b/protocols/MinecraftDynmap/src/chat.cpp index 5667d5c2d5..b9ca698088 100644 --- a/protocols/MinecraftDynmap/src/chat.cpp +++ b/protocols/MinecraftDynmap/src/chat.cpp @@ -132,8 +132,8 @@ INT_PTR MinecraftDynmapProto::OnJoinChat(WPARAM,LPARAM suppress) return 0; // Create a group - Chat_AddGroup(m_szModuleName, m_tszUserName, LPGENW("Admin")); - Chat_AddGroup(m_szModuleName, m_tszUserName, LPGENW("Normal")); + Chat_AddGroup(m_szModuleName, m_tszUserName, TranslateT("Admin")); + Chat_AddGroup(m_szModuleName, m_tszUserName, TranslateT("Normal")); // Note: Initialization will finish up in SetChatStatus, called separately if (!suppress) diff --git a/protocols/Omegle/src/chat.cpp b/protocols/Omegle/src/chat.cpp index 8552d7885c..6e6e6999de 100644 --- a/protocols/Omegle/src/chat.cpp +++ b/protocols/Omegle/src/chat.cpp @@ -273,8 +273,8 @@ INT_PTR OmegleProto::OnJoinChat(WPARAM, LPARAM suppress) return 0; // Create a group - Chat_AddGroup(m_szModuleName, m_tszUserName, LPGENW("Admin")); - Chat_AddGroup(m_szModuleName, m_tszUserName, LPGENW("Normal")); + Chat_AddGroup(m_szModuleName, m_tszUserName, TranslateT("Admin")); + Chat_AddGroup(m_szModuleName, m_tszUserName, TranslateT("Normal")); SetTopic(); diff --git a/protocols/Sametime/src/conference.cpp b/protocols/Sametime/src/conference.cpp index 1cd96fd928..04af2e7372 100644 --- a/protocols/Sametime/src/conference.cpp +++ b/protocols/Sametime/src/conference.cpp @@ -115,7 +115,7 @@ void mwServiceConf_conf_opened(mwConference* conf, GList* members) Chat_NewSession(GCW_CHATROOM, proto->m_szModuleName, tszConfId, tszConfTitle); // add a group - Chat_AddGroup(proto->m_szModuleName, tszConfId, LPGENW("Normal")); + Chat_AddGroup(proto->m_szModuleName, tszConfId, TranslateT("Normal")); // add users GCDEST gcd = { proto->m_szModuleName, tszConfId, GC_EVENT_JOIN }; diff --git a/protocols/SkypeWeb/src/skype_chatrooms.cpp b/protocols/SkypeWeb/src/skype_chatrooms.cpp index f18e6f6148..d86c029374 100644 --- a/protocols/SkypeWeb/src/skype_chatrooms.cpp +++ b/protocols/SkypeWeb/src/skype_chatrooms.cpp @@ -62,8 +62,8 @@ void CSkypeProto::StartChatRoom(const wchar_t *tid, const wchar_t *tname) Chat_NewSession(GCW_CHATROOM, m_szModuleName, tid, tname); // Create a user statuses - Chat_AddGroup(m_szModuleName, tid, LPGENW("Admin")); - Chat_AddGroup(m_szModuleName, tid, LPGENW("User")); + Chat_AddGroup(m_szModuleName, tid, TranslateT("Admin")); + Chat_AddGroup(m_szModuleName, tid, TranslateT("User")); // Finish initialization Chat_Control(m_szModuleName, tid, (getBool("HideChats", 1) ? WINDOW_HIDDEN : SESSION_INITDONE)); diff --git a/protocols/Twitter/src/chat.cpp b/protocols/Twitter/src/chat.cpp index 85b210d86b..ed7c69e3c3 100644 --- a/protocols/Twitter/src/chat.cpp +++ b/protocols/Twitter/src/chat.cpp @@ -123,7 +123,7 @@ INT_PTR TwitterProto::OnJoinChat(WPARAM, LPARAM suppress) return 0; // ***** Create a group - Chat_AddGroup(m_szModuleName, m_tszUserName, LPGENW("Normal")); + Chat_AddGroup(m_szModuleName, m_tszUserName, TranslateT("Normal")); // ***** Hook events HookProtoEvent(ME_GC_EVENT, &TwitterProto::OnChatOutgoing); diff --git a/protocols/VKontakte/src/vk_chats.cpp b/protocols/VKontakte/src/vk_chats.cpp index 86f75bf67d..2d3fdeb13c 100644 --- a/protocols/VKontakte/src/vk_chats.cpp +++ b/protocols/VKontakte/src/vk_chats.cpp @@ -72,7 +72,7 @@ CVkChatInfo* CVkProto::AppendChat(int id, const JSONNode &jnDlg) m_chats.insert(c); for (int i = _countof(sttStatuses)-1; i >= 0; i--) - Chat_AddGroup(m_szModuleName, sid, sttStatuses[i]); + Chat_AddGroup(m_szModuleName, sid, TranslateW(sttStatuses[i])); setDword(gci.hContact, "vk_chat_id", id); diff --git a/protocols/WhatsApp/src/chat.cpp b/protocols/WhatsApp/src/chat.cpp index e1c7b01f0b..a87be6a24f 100644 --- a/protocols/WhatsApp/src/chat.cpp +++ b/protocols/WhatsApp/src/chat.cpp @@ -307,7 +307,7 @@ WAChatInfo* WhatsAppProto::InitChat(const std::string &jid, const std::string &n pInfo->hContact = (hOldContact != NULL) ? hOldContact : ContactIDToHContact(jid); for (int i = _countof(sttStatuses) - 1; i >= 0; i--) - Chat_AddGroup(m_szModuleName, ptszJid, sttStatuses[i]); + Chat_AddGroup(m_szModuleName, ptszJid, TranslateW(sttStatuses[i])); Chat_Control(m_szModuleName, ptszJid, getBool(WHATSAPP_KEY_AUTORUNCHATS, true) ? SESSION_INITDONE : WINDOW_HIDDEN); Chat_Control(m_szModuleName, ptszJid, SESSION_ONLINE); diff --git a/protocols/Yahoo/src/chat.cpp b/protocols/Yahoo/src/chat.cpp index 6a70f89e42..afb1fafd94 100644 --- a/protocols/Yahoo/src/chat.cpp +++ b/protocols/Yahoo/src/chat.cpp @@ -153,8 +153,8 @@ void CYahooProto::ChatStart(const char* room) ptrW idt(mir_a2u(room)); Chat_NewSession(GCW_CHATROOM, m_szModuleName, idt, idt); - Chat_AddGroup(m_szModuleName, idt, LPGENW("Me")); - Chat_AddGroup(m_szModuleName, idt, LPGENW("Others")); + Chat_AddGroup(m_szModuleName, idt, TranslateT("Me")); + Chat_AddGroup(m_szModuleName, idt, TranslateT("Others")); Chat_Control(m_szModuleName, idt, SESSION_INITDONE); Chat_Control(m_szModuleName, idt, SESSION_ONLINE); -- cgit v1.2.3