From 6cc150354bd07c0e7f6e50bd5eca489fe71b63c0 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Mon, 4 Jun 2012 20:12:41 +0000 Subject: chat items translation issues git-svn-id: http://svn.miranda-ng.org/main/trunk@306 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/Chat/tools.c | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) (limited to 'plugins/Chat/tools.c') diff --git a/plugins/Chat/tools.c b/plugins/Chat/tools.c index ccdfdb7585..b616531f41 100644 --- a/plugins/Chat/tools.c +++ b/plugins/Chat/tools.c @@ -1,8 +1,8 @@ /* Chat module plugin for Miranda IM -Copyright 2000-2010 Miranda ICQ/IM project, -all portions of this codebase are copyrighted to the people +Copyright 2000-2010 Miranda ICQ/IM project, +all portions of this codebase are copyrighted to the people listed in contributors.txt. This program is free software; you can redistribute it and/or @@ -736,29 +736,30 @@ UINT CreateGCMenu(HWND hwndDlg, HMENU *hMenu, int iIndex, POINT pt, SESSION_INFO AppendMenu(*hMenu, MF_SEPARATOR, 0, 0); for (i = 0; i < gcmi.nItems; i++) { - TCHAR* ptszDescr = a2tf( gcmi.Item[i].pszDesc, si->dwFlags ); + TCHAR* ptszDescr = a2tf(gcmi.Item[i].pszDesc, si->dwFlags, 0); + TCHAR* ptszText = TranslateTS(ptszDescr); DWORD dwState = gcmi.Item[i].bDisabled ? MF_GRAYED : 0; - if ( gcmi.Item[i].uType == MENU_NEWPOPUP ) { + if (gcmi.Item[i].uType == MENU_NEWPOPUP) { hSubMenu = CreateMenu(); - AppendMenu( *hMenu, dwState|MF_POPUP, (UINT_PTR)hSubMenu, ptszDescr ); + AppendMenu(*hMenu, dwState | MF_POPUP, (UINT_PTR)hSubMenu, ptszText); } else if (gcmi.Item[i].uType == MENU_POPUPHMENU) - AppendMenu( hSubMenu==0?*hMenu:hSubMenu, dwState|MF_POPUP, gcmi.Item[i].dwID, ptszDescr); + AppendMenu(hSubMenu == 0 ? *hMenu : hSubMenu, dwState | MF_POPUP, gcmi.Item[i].dwID, ptszText); else if (gcmi.Item[i].uType == MENU_POPUPITEM) - AppendMenu( hSubMenu==0?*hMenu:hSubMenu, dwState|MF_STRING, gcmi.Item[i].dwID, ptszDescr); + AppendMenu(hSubMenu == 0 ? *hMenu : hSubMenu, dwState | MF_STRING, gcmi.Item[i].dwID, ptszText); else if (gcmi.Item[i].uType == MENU_POPUPCHECK) - AppendMenu( hSubMenu==0?*hMenu:hSubMenu, dwState|MF_CHECKED|MF_STRING, gcmi.Item[i].dwID, ptszDescr); + AppendMenu(hSubMenu == 0 ? *hMenu : hSubMenu, dwState | MF_CHECKED | MF_STRING, gcmi.Item[i].dwID, ptszText); else if (gcmi.Item[i].uType == MENU_POPUPSEPARATOR) - AppendMenu( hSubMenu==0?*hMenu:hSubMenu, MF_SEPARATOR, 0, ptszDescr ); + AppendMenu(hSubMenu == 0 ? *hMenu : hSubMenu, MF_SEPARATOR, 0, ptszText); else if (gcmi.Item[i].uType == MENU_SEPARATOR) - AppendMenu( *hMenu, MF_SEPARATOR, 0, ptszDescr ); + AppendMenu(*hMenu, MF_SEPARATOR, 0, ptszText); else if (gcmi.Item[i].uType == MENU_HMENU) - AppendMenu( *hMenu, dwState|MF_POPUP, gcmi.Item[i].dwID, ptszDescr); + AppendMenu(*hMenu, dwState | MF_POPUP, gcmi.Item[i].dwID, ptszText); else if (gcmi.Item[i].uType == MENU_ITEM) - AppendMenu( *hMenu, dwState|MF_STRING, gcmi.Item[i].dwID, ptszDescr ); + AppendMenu(*hMenu, dwState | MF_STRING, gcmi.Item[i].dwID, ptszText); else if (gcmi.Item[i].uType == MENU_CHECK) - AppendMenu( *hMenu, dwState|MF_CHECKED|MF_STRING, gcmi.Item[i].dwID, ptszDescr ); + AppendMenu(*hMenu, dwState | MF_CHECKED | MF_STRING, gcmi.Item[i].dwID, ptszText); mir_free( ptszDescr ); } -- cgit v1.2.3