Fierelier/notepad-plus-plus-legacy
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix a small regression on Find dialog status bar

Browse Source 
Fix #5070, close #5094
This commit is contained in:
Don HO 2019-03-04 03:25:54 +01:00
parent acd2cc6ba2
commit 157846c60a
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1173,8 +1173,8 @@ Do you want to launch Notepad++ in Administrator mode?"/>
<find-status-replaceinopenedfiles-nb-replaced value="Replace in Opened Files: $INT_REPLACE$ occurrences were replaced"/> <find-status-replaceinopenedfiles-nb-replaced value="Replace in Opened Files: $INT_REPLACE$ occurrences were replaced"/>
<find-status-mark-re-malformed value="Mark: The regular expression to search is malformed"/> <find-status-mark-re-malformed value="Mark: The regular expression to search is malformed"/>
<find-status-invalid-re value="Find: Invalid regular expression"/> <find-status-invalid-re value="Find: Invalid regular expression"/>
<find-status-mark-1-match value="1 match"/> <find-status-mark-1-match value="Mark: 1 match"/>
<find-status-mark-nb-matches value="$INT_REPLACE$ matches"/> <find-status-mark-nb-matches value="Mark: $INT_REPLACE$ matches"/>
<find-status-count-re-malformed value="Count: The regular expression to search is malformed"/> <find-status-count-re-malformed value="Count: The regular expression to search is malformed"/>
<find-status-count-1-match value="Count: 1 match"/> <find-status-count-1-match value="Count: 1 match"/>
<find-status-count-nb-matches value="Count: $INT_REPLACE$ matches"/> <find-status-count-nb-matches value="Count: $INT_REPLACE$ matches"/>

8
PowerEditor/src/ScitillaComponent/FindReplaceDlg.cpp
View File

@ -1281,11 +1281,11 @@ INT_PTR CALLBACK FindReplaceDlg::run_dlgProc(UINT message, WPARAM wParam, LPARAM
{ {
if (nbMarked == 1) if (nbMarked == 1)
{ {
result = pNativeSpeaker->getLocalizedStrFromID("find-status-mark-1-match", TEXT("1 match.")); result = pNativeSpeaker->getLocalizedStrFromID("find-status-mark-1-match", TEXT("Mark: 1 match."));
} }
else else
{ {
result = pNativeSpeaker->getLocalizedStrFromID("find-status-mark-nb-matches", TEXT("$INT_REPLACE$ matches.")); result = pNativeSpeaker->getLocalizedStrFromID("find-status-mark-nb-matches", TEXT("Mark: $INT_REPLACE$ matches."));
result = stringReplace(result, TEXT("$INT_REPLACE$"), std::to_wstring(nbMarked)); result = stringReplace(result, TEXT("$INT_REPLACE$"), std::to_wstring(nbMarked));
} }
} }
@ -2712,11 +2712,11 @@ void FindReplaceDlg::execSavedCommand(int cmd, uptr_t intValue, generic_string s
{ {
if (nbMarked == 1) if (nbMarked == 1)
{ {
result = pNativeSpeaker->getLocalizedStrFromID("find-status-mark-1-match", TEXT("1 match.")); result = pNativeSpeaker->getLocalizedStrFromID("find-status-mark-1-match", TEXT("Mark: 1 match."));
} }
else else
{ {
result = pNativeSpeaker->getLocalizedStrFromID("find-status-mark-nb-matches", TEXT("$INT_REPLACE$ matches.")); result = pNativeSpeaker->getLocalizedStrFromID("find-status-mark-nb-matches", TEXT("Mark: $INT_REPLACE$ matches."));
result = stringReplace(result, TEXT("$INT_REPLACE$"), std::to_wstring(nbMarked)); result = stringReplace(result, TEXT("$INT_REPLACE$"), std::to_wstring(nbMarked));
} }
} }