Skip to content

Commit

Permalink
Group: "Searching for keywords" searches for a single keyword ==> use…
Browse files Browse the repository at this point in the history
… singular (#6995)
  • Loading branch information
mlep authored Oct 14, 2020
1 parent e955c46 commit 0563a49
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 6 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ inserting new citations in a OpenOffic/LibreOffice document. [#6957](https://git
- We improved the detection of "short" DOIs [6880](https://github.com/JabRef/jabref/issues/6880)
- We improved the duplicate detection when identifiers like DOI or arxiv are semantiaclly the same, but just syntactically differ (e.g. with or without http(s):// prefix). [#6707](https://github.com/JabRef/jabref/issues/6707)
- We changed in the group interface "Generate groups from keywords in a BibTeX field" by "Generate groups from keywords in the following field". [#6983](https://github.com/JabRef/jabref/issues/6983)
- We changed the name of a group type from "Searching for keywords" to "Searching for a keyword". [6995](https://github.com/JabRef/jabref/pull/6995)

### Fixed

Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/jabref/gui/groups/GroupDialog.fxml
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@
</tooltip>
</RadioButton>
<RadioButton fx:id="keywordsRadioButton" toggleGroup="$type" wrapText="true"
text="%Searching for keywords">
text="%Searching for a keyword">
<tooltip>
<Tooltip text="%Dynamically group entries by searching a field for a keyword"/>
</tooltip>
Expand Down
6 changes: 3 additions & 3 deletions src/main/java/org/jabref/gui/groups/GroupDialogViewModel.java
Original file line number Diff line number Diff line change
Expand Up @@ -170,20 +170,20 @@ private void setupValidation() {
}
},
ValidationMessage.error(String.format("%s > %n %s %n %n %s",
Localization.lang("Searching for keywords"),
Localization.lang("Searching for a keyword"),
Localization.lang("Keywords"),
Localization.lang("Invalid regular expression."))));

keywordFieldEmptyValidator = new FunctionBasedValidator<>(
keywordGroupSearchFieldProperty,
StringUtil::isNotBlank,
ValidationMessage.error(Localization.lang("Please enter a field name to search for keywords.")));
ValidationMessage.error(Localization.lang("Please enter a field name to search for a keyword.")));

keywordSearchTermEmptyValidator = new FunctionBasedValidator<>(
keywordGroupSearchTermProperty,
input -> !StringUtil.isNullOrEmpty(input),
ValidationMessage.error(String.format("%s > %n %s %n %n %s",
Localization.lang("Searching for keywords"),
Localization.lang("Searching for a keyword"),
Localization.lang("Keywords"),
Localization.lang("Search term is empty.")
)));
Expand Down
4 changes: 2 additions & 2 deletions src/main/resources/l10n/JabRef_en.properties
Original file line number Diff line number Diff line change
Expand Up @@ -2054,7 +2054,7 @@ Intersection=Intersection
Union=Union
Collect\ by=Collect by
Explicit\ selection=Explicit selection
Searching\ for\ keywords=Searching for keywords
Searching\ for\ a\ keyword=Searching for a keyword
Free\ search\ expression=Free search expression
Specified\ keywords=Specified keywords
Cited\ entries=Cited entries
Expand Down Expand Up @@ -2098,7 +2098,7 @@ Unable\ to\ open\ ShortScience.=Unable to open ShortScience.
Shared\ database=Shared database
Lookup=Lookup
Please\ enter\ a\ field\ name\ to\ search\ for\ keywords.=Please enter a field name to search for keywords.
Please\ enter\ a\ field\ name\ to\ search\ for\ a\ keyword.=Please enter a field name to search for a keyword.
Access\ date\ of\ the\ address\ specified\ in\ the\ url\ field.=Access date of the address specified in the url field.
Additional\ information\ related\ to\ the\ resource\ indicated\ by\ the\ eprint\ field.=Additional information related to the resource indicated by the eprint field.
Annex\ to\ the\ eventtitle\ field.=Annex to the eventtitle field.
Expand Down

0 comments on commit 0563a49

Please sign in to comment.