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

Add missing translation for folder browser title 

Affected places:
File > Open Folder as Workspace
Search > Find in Files
Settings > Preferences > Default Directory > [...]
Settings > Preferences > Backup > [...]

Fix #10983, fix #10984, fix #10985, close #11005
This commit is contained in:
mere-human 2022-01-07 13:01:48 +02:00 committed by Don Ho
parent 44c9a0561b
commit 78c6554e91
5 changed files with 21 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1390,9 +1390,11 @@ Continue?"/>
<word-chars-list-space-warning value="$INT_REPLACE$ space(s)"/>
<word-chars-list-tab-warning value="$INT_REPLACE$ TAB(s)"/>
<word-chars-list-warning-end value=" in your character list."/> <!-- HowToReproduce: In "Delimiter" section of Preferences dialog, check "Add your character as part of word\r(don't choose it unless you know what you're doing)", then type a white-space in the text field. -->
<backup-select-folder value="Select a folder as backup directory"/> <!-- HowToReproduce: Settings > Preferences > Backup > [...] -->
<cloud-invalid-warning value="Invalid path."/>
<cloud-restart-warning value="Please restart Notepad++ to take effect."/>
<cloud-select-folder value="Select a folder from/to where Notepad++ reads/writes its settings"/> <!-- HowToReproduce: In "Cloud" section of Preferences dialog, check "Set your cloud location path here: ", then click the button "...". This message is displayed in the "Browse For Folder" dialog. -->
<default-open-save-select-folder value="Select a folder as default directory"/> <!-- HowToReproduce: Settings > Preferences > Default Directory > [...] -->
<shift-change-direction-tip value="Use Shift+Enter to search in the opposite direction"/>
<two-find-buttons-tip value="2 find buttons mode"/>
<file-rename-title value="Rename"/>
@ -1407,6 +1409,7 @@ Find in all files but exclude folders tests, bin &amp;&amp; bin64:
Find in all files but exclude all folders log or logs recursively:
*.* !+\log*"/> <!-- HowToReproduce: Tip of mouse hovered on "Filters" label in "Find in Files" section of Find dialog. -->
<find-in-files-select-folder value="Select a folder to search from"/> <!-- HowToReproduce: Search > Find in Files > [...] -->
<find-status-top-reached value="Find: Found the 1st occurrence from the bottom. The beginning of the document has been reached."/>
<find-status-end-reached value="Find: Found the 1st occurrence from the top. The end of the document has been reached."/>
<find-status-replaceinfiles-1-replaced value="Replace in Files: 1 occurrence was replaced"/>

5
PowerEditor/src/NppCommands.cpp
View File

@ -183,7 +183,10 @@ void Notepad_plus::command(int id)
case IDM_FILE_OPENFOLDERASWORSPACE:
{
generic_string folderPath = folderBrowser(_pPublicInterface->getHSelf(), TEXT("Select a folder to add in Folder as Workspace panel"));
NativeLangSpeaker* pNativeSpeaker = NppParameters::getInstance().getNativeLangSpeaker();
generic_string openWorkspaceStr = pNativeSpeaker->getAttrNameStr(TEXT("Select a folder to add in Folder as Workspace panel"),
FOLDERASWORKSPACE_NODE, "SelectFolderFromBrowserString");
generic_string folderPath = folderBrowser(_pPublicInterface->getHSelf(), openWorkspaceStr);
if (!folderPath.empty())
{
if (_pFileBrowser == nullptr) // first launch, check in params to open folders

6
PowerEditor/src/ScintillaComponent/FindReplaceDlg.cpp
View File

@ -1840,7 +1840,11 @@ INT_PTR CALLBACK FindReplaceDlg::run_dlgProc(UINT message, WPARAM wParam, LPARAM
case IDD_FINDINFILES_BROWSE_BUTTON :
{
if (_currentStatus == FINDINFILES_DLG)
folderBrowser(_hSelf, TEXT("Select a folder to search from"), IDD_FINDINFILES_DIR_COMBO, _options._directory.c_str());
{
NativeLangSpeaker* pNativeSpeaker = NppParameters::getInstance().getNativeLangSpeaker();
const generic_string title = pNativeSpeaker->getLocalizedStrFromID("find-in-files-select-folder", TEXT("Select a folder to search from"));
folderBrowser(_hSelf, title, IDD_FINDINFILES_DIR_COMBO, _options._directory.c_str());
}
}
return TRUE;

2
PowerEditor/src/WinControls/FileBrowser/fileBrowser.cpp
View File

@ -863,7 +863,7 @@ void FileBrowser::popupMenuCmd(int cmdID)
{
NativeLangSpeaker *pNativeSpeaker = (NppParameters::getInstance()).getNativeLangSpeaker();
generic_string openWorkspaceStr = pNativeSpeaker->getAttrNameStr(TEXT("Select a folder to add in Folder as Workspace panel"), FOLDERASWORKSPACE_NODE, "SelectFolderFromBrowserString");
generic_string folderPath = folderBrowser(_hParent, openWorkspaceStr.c_str());
generic_string folderPath = folderBrowser(_hParent, openWorkspaceStr);
if (!folderPath.empty())
{
addRootFolder(folderPath);

10
PowerEditor/src/WinControls/Preference/preferenceDlg.cpp
View File

@ -2169,7 +2169,11 @@ INT_PTR CALLBACK DefaultDirectorySubDlg::run_dlgProc(UINT message, WPARAM wParam
return TRUE;
case IDD_OPENSAVEDIR_ALWAYSON_BROWSE_BUTTON :
folderBrowser(_hSelf, TEXT("Select a folder as default directory"), IDC_OPENSAVEDIR_ALWAYSON_EDIT);
{
generic_string title = nppParam.getNativeLangSpeaker()->getLocalizedStrFromID("default-open-save-select-folder",
TEXT("Select a folder as default directory"));
folderBrowser(_hSelf, title, IDC_OPENSAVEDIR_ALWAYSON_EDIT);
}
return TRUE;
case IDC_OPENSAVEDIR_CHECK_DRROPFOLDEROPENFILES:
@ -3485,7 +3489,9 @@ INT_PTR CALLBACK BackupSubDlg::run_dlgProc(UINT message, WPARAM wParam, LPARAM l
}
case IDD_BACKUPDIR_BROWSE_BUTTON :
{
folderBrowser(_hSelf, TEXT("Select a folder as backup directory"), IDC_BACKUPDIR_EDIT);
generic_string title = nppParam.getNativeLangSpeaker()->getLocalizedStrFromID("backup-select-folder",
TEXT("Select a folder as backup directory"));
folderBrowser(_hSelf, title, IDC_BACKUPDIR_EDIT);
return TRUE;
}