Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use plural form when there is no match in result status #848

Merged
merged 1 commit into from
Mar 13, 2024
Merged

Use plural form when there is no match in result status #848

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 4 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

## [Unreleased]

### Fixed

- Use plural form when there is no match in result status: "0 matches".

## [4.11.1] - 2024-03-13


Expand Down
5 changes: 3 additions & 2 deletions src/main/java/org/corpus_tools/annis/gui/controller/CountCallback.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,8 +56,9 @@ public void onSuccess(CountExtra result, int statusCode,
ui.getQueryState().getExecutedTasks().remove(QueryUIState.QueryType.COUNT);

// Decide whether to use plural
String documentString = result.getDocumentCount() > 1 ? "documents" : "document";
String matchesString = result.getMatchCount() > 1 ? "matches" : "match";
String documentString = result.getDocumentCount() == 1 ? "document" : "documents";
String matchesString =
result.getMatchCount() == 1 ? "match" : "matches";
// Construct the whole string, but omit the document count if it is zero (e.g. because
// there are only sub-corpus or document matches and no matches inside a document)
String completeString =
Expand Down
Loading