tyler.durden/notepad-plus-plus
1
0
Fork 0
mirror of https://github.com/notepad-plus-plus/notepad-plus-plus.git synced 2025-07-27 07:44:24 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix "Recent Files" menu lost translation

Browse Source 
Fix #9343, close #13208
This commit is contained in:
ArkadiuszMichalski 2023-02-17 12:07:27 +01:00 committed by Don Ho
parent 892ab0850f
commit 9c0e1e4559
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
PowerEditor/src/ScintillaComponent/UserDefineDialog.cpp
View File

@ -947,7 +947,7 @@ void UserDefineDialog::changeStyle()
idStr = std::to_string(IDC_DOCK_BUTTON); idStr = std::to_string(IDC_DOCK_BUTTON);
} }
dockButtonLabel= pNativeSpeaker->getAttrNameByIdStr(defauleLabel.c_str(), targetNode, idStr.c_str()); dockButtonLabel = pNativeSpeaker->getAttrNameByIdStr(defauleLabel.c_str(), targetNode, idStr.c_str());
::SetDlgItemText(_hSelf, IDC_DOCK_BUTTON, dockButtonLabel.c_str()); ::SetDlgItemText(_hSelf, IDC_DOCK_BUTTON, dockButtonLabel.c_str());
auto style = ::GetWindowLongPtr(_hSelf, GWL_STYLE); auto style = ::GetWindowLongPtr(_hSelf, GWL_STYLE);

2
PowerEditor/src/lastRecentFileList.cpp
View File

@ -90,7 +90,7 @@ void LastRecentFileList::updateMenu()
//add separators //add separators
NativeLangSpeaker *pNativeLangSpeaker = nppParam.getNativeLangSpeaker(); NativeLangSpeaker *pNativeLangSpeaker = nppParam.getNativeLangSpeaker();
generic_string recentFileList = pNativeLangSpeaker->getSpecialMenuEntryName("RecentFiles"); generic_string recentFileList = pNativeLangSpeaker->getSubMenuEntryName("file-recentFiles");
generic_string openRecentClosedFile = pNativeLangSpeaker->getNativeLangMenuString(IDM_FILE_RESTORELASTCLOSEDFILE); generic_string openRecentClosedFile = pNativeLangSpeaker->getNativeLangMenuString(IDM_FILE_RESTORELASTCLOSEDFILE);
generic_string openAllFiles = pNativeLangSpeaker->getNativeLangMenuString(IDM_OPEN_ALL_RECENT_FILE); generic_string openAllFiles = pNativeLangSpeaker->getNativeLangMenuString(IDM_OPEN_ALL_RECENT_FILE);
generic_string cleanFileList = pNativeLangSpeaker->getNativeLangMenuString(IDM_CLEAN_RECENT_FILE_LIST); generic_string cleanFileList = pNativeLangSpeaker->getNativeLangMenuString(IDM_CLEAN_RECENT_FILE_LIST);

8
PowerEditor/src/localization.cpp
View File

@ -144,14 +144,14 @@ void NativeLangSpeaker::init(TiXmlDocumentA *nativeLangDocRootA, bool loadIfEngl
} }
} }
generic_string NativeLangSpeaker::getSpecialMenuEntryName(const char *entryName) const generic_string NativeLangSpeaker::getSubMenuEntryName(const char *nodeName) const
{ {
if (!_nativeLangA) return TEXT(""); if (!_nativeLangA) return TEXT("");
TiXmlNodeA *mainMenu = _nativeLangA->FirstChild("Menu"); TiXmlNodeA *mainMenu = _nativeLangA->FirstChild("Menu");
if (!mainMenu) return TEXT(""); if (!mainMenu) return TEXT("");
mainMenu = mainMenu->FirstChild("Main"); mainMenu = mainMenu->FirstChild("Main");
if (!mainMenu) return TEXT(""); if (!mainMenu) return TEXT("");
TiXmlNodeA *entriesRoot = mainMenu->FirstChild("Entries"); TiXmlNodeA *entriesRoot = mainMenu->FirstChild("SubEntries");
if (!entriesRoot) return TEXT(""); if (!entriesRoot) return TEXT("");
WcharMbcsConvertor& wmc = WcharMbcsConvertor::getInstance(); WcharMbcsConvertor& wmc = WcharMbcsConvertor::getInstance();
@ -162,11 +162,11 @@ generic_string NativeLangSpeaker::getSpecialMenuEntryName(const char *entryName)
{ {
TiXmlElementA *element = childNode->ToElement(); TiXmlElementA *element = childNode->ToElement();
const char *idName = element->Attribute("idName"); const char *idName = element->Attribute("subMenuId");
if (idName) if (idName)
{ {
const char *name = element->Attribute("name"); const char *name = element->Attribute("name");
if (!strcmp(idName, entryName)) if (!strcmp(idName, nodeName))
{ {
return wmc.char2wchar(name, _nativeLangEncoding); return wmc.char2wchar(name, _nativeLangEncoding);
} }

2
PowerEditor/src/localization.h
View File

@ -45,7 +45,7 @@ public:
TiXmlNodeA * searchDlgNode(TiXmlNodeA *node, const char *dlgTagName); TiXmlNodeA * searchDlgNode(TiXmlNodeA *node, const char *dlgTagName);
bool changeDlgLang(HWND hDlg, const char *dlgTagName, char *title = NULL, size_t titleMaxSize = 0); bool changeDlgLang(HWND hDlg, const char *dlgTagName, char *title = NULL, size_t titleMaxSize = 0);
void changeLangTabDropContextMenu(HMENU hCM); void changeLangTabDropContextMenu(HMENU hCM);
generic_string getSpecialMenuEntryName(const char *entryName) const; generic_string getSubMenuEntryName(const char *nodeName) const;
generic_string getNativeLangMenuString(int itemID) const; generic_string getNativeLangMenuString(int itemID) const;
generic_string getShortcutNameString(int itemID) const; generic_string getShortcutNameString(int itemID) const;