github
/
notepad-plus-plus
mirror of https://github.com/notepad-plus-plus/notepad-plus-plus
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Make categories in the Shortcut Mapper dialog translatable 

Fix #8858, close #13110
pull/13120/head
ArkadiuszMichalski 2023-02-13 07:29:59 +01:00 committed by Don Ho
parent 63ba30cfe1
commit f7fcab4c21
3 changed files with 28 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
PowerEditor/installer/nativeLang/english.xml
View File

@ -592,6 +592,17 @@ The comments are here for explanation, it's not necessary to translate them.
<ScintillaCommandsTab name="Scintilla commands"/> <ScintillaCommandsTab name="Scintilla commands"/>
<ConflictInfoOk name="No shortcut conflicts for this item."/> <ConflictInfoOk name="No shortcut conflicts for this item."/>
<ConflictInfoEditing name="No conflicts . . ."/> <ConflictInfoEditing name="No conflicts . . ."/>
<WindowCategory name="Window"/>
<FileCategory name="File"/>
<EditCategory name="Edit"/>
<SearchCategory name="Search"/>
<ViewCategory name="View"/>
<FormatCategory name="Format"/>
<LangCategory name="Lang"/>
<AboutCategory name="About"/>
<SettingCategory name="Setting"/>
<ToolCategory name="Tool"/>
<ExecuteCategory name="Execute"/>
<MainCommandNames> <MainCommandNames>
<Item id="41019" name="Open containing folder in Explorer"/> <Item id="41019" name="Open containing folder in Explorer"/>
<Item id="41020" name="Open containing folder in Command Prompt"/> <Item id="41020" name="Open containing folder in Command Prompt"/>

11
PowerEditor/installer/nativeLang/english_customizable.xml
View File

@ -536,6 +536,17 @@
<ScintillaCommandsTab name="Scintilla commands"/> <ScintillaCommandsTab name="Scintilla commands"/>
<ConflictInfoOk name="No shortcut conflicts for this item."/> <ConflictInfoOk name="No shortcut conflicts for this item."/>
<ConflictInfoEditing name="No conflicts . . ."/> <ConflictInfoEditing name="No conflicts . . ."/>
<WindowCategory name="Window"/>
<FileCategory name="File"/>
<EditCategory name="Edit"/>
<SearchCategory name="Search"/>
<ViewCategory name="View"/>
<FormatCategory name="Format"/>
<LangCategory name="Lang"/>
<AboutCategory name="About"/>
<SettingCategory name="Setting"/>
<ToolCategory name="Tool"/>
<ExecuteCategory name="Execute"/>
<MainCommandNames> <MainCommandNames>
<Item id="41019" name="Open containing folder in Explorer"/> <Item id="41019" name="Open containing folder in Explorer"/>
<Item id="41020" name="Open containing folder in Command Prompt"/> <Item id="41020" name="Open containing folder in Command Prompt"/>

7
PowerEditor/src/WinControls/Grid/ShortcutMapper.cpp
View File

@ -287,6 +287,7 @@ void ShortcutMapper::fillOutBabyGrid()
{ {
case STATE_MENU: case STATE_MENU:
{ {
NativeLangSpeaker* nativeLangSpeaker = NppParameters::getInstance().getNativeLangSpeaker();
vector<CommandShortcut> & cshortcuts = nppParam.getUserShortcuts(); vector<CommandShortcut> & cshortcuts = nppParam.getUserShortcuts();
cs_index = 1; cs_index = 1;
for (size_t i = 0; i < nbItems; ++i) for (size_t i = 0; i < nbItems; ++i)
@ -299,7 +300,11 @@ void ShortcutMapper::fillOutBabyGrid()
_babygrid.setText(cs_index, 1, cshortcuts[i].getName()); _babygrid.setText(cs_index, 1, cshortcuts[i].getName());
if (cshortcuts[i].isEnabled()) //avoid empty strings for better performance if (cshortcuts[i].isEnabled()) //avoid empty strings for better performance
_babygrid.setText(cs_index, 2, cshortcuts[i].toString().c_str()); _babygrid.setText(cs_index, 2, cshortcuts[i].toString().c_str());
_babygrid.setText(cs_index, 3, cshortcuts[i].getCategory());
const TCHAR* category = cshortcuts[i].getCategory();
generic_string categoryStr = nativeLangSpeaker->getShortcutMapperLangStr((std::string(wstring2string(category, CP_UTF8)) + "Category").c_str(), category);
_babygrid.setText(cs_index, 3, categoryStr.c_str());
if (isMarker) if (isMarker)
isMarker = _babygrid.setMarker(false); isMarker = _babygrid.setMarker(false);
_shortcutIndex.push_back(i); _shortcutIndex.push_back(i);