Skip to content
This repository was archived by the owner on Sep 6, 2021. It is now read-only.

Added 'no results' and '1 result' to search dialog #4853

Merged
merged 3 commits into from
Aug 21, 2013
Merged

Added 'no results' and '1 result' to search dialog #4853

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d1be2ac
Added 'no results' and '1 result' to search dialog
Aug 21, 2013
38ca366
Merge remote-tracking branch 'upstream/master'
Aug 21, 2013
26a6133
Fixed formatting problem and removed unused code
Aug 21, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions src/nls/root/strings.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,8 @@ define({
// Find, Replace, Find in Files
"SEARCH_REGEXP_INFO" : "Use /re/ syntax for regexp search",
"FIND_RESULT_COUNT" : "{0} results",
"FIND_RESULT_COUNT_SINGLE" : "1 result",
"FIND_NO_RESULTS" : "No results",
"WITH" : "With",
"BUTTON_YES" : "Yes",
"BUTTON_NO" : "No",
Expand Down
10 changes: 9 additions & 1 deletion src/search/FindReplace.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -240,7 +240,15 @@ define(function (require, exports, module) {
cursor = getSearchCursor(cm, state.query, {line: cursor.to().line + 1, ch: 0});
}
}
$("#find-counter").text(StringUtils.format(Strings.FIND_RESULT_COUNT, resultCount));

if (resultCount === 0) {
$("#find-counter").text(Strings.FIND_NO_RESULTS);
} else if (resultCount === 1) {
$("#find-counter").text(Strings.FIND_RESULT_COUNT_SINGLE);
} else {
$("#find-counter").text(StringUtils.format(Strings.FIND_RESULT_COUNT, resultCount));
}

} else {
$("#find-counter").text("");
}
Expand Down