Skip to content

Commit

Permalink
Change "Key bindings" to "Keyboard shortcuts" (JabRef#11153)
Browse files Browse the repository at this point in the history
* refactor: changed Key Bindings to Keyboard shortcuts in UI, updated i10n en_properties

* fix: removed properties in i10n english file to fix unit tests

* doc: updated CHANGELOG.md to register changes

* Update CHANGELOG.md

---------

Co-authored-by: Christoph <[email protected]>
  • Loading branch information
jeanprbt and Siedlerchr authored Apr 5, 2024
1 parent 67314ba commit 74c8917
Show file tree
Hide file tree
Showing 6 changed files with 14 additions and 13 deletions.
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@ Note that this project **does not** adhere to [Semantic Versioning](https://semv

### Changed

- We replaced the word "Key bindings" with "Keyboard shortcuts" in the Preferences tab. [#11153](https://github.com/JabRef/jabref/pull/11153)

### Fixed

- We fixed an issue where entry type with duplicate fields prevented opening existing libraries with custom entry types [#11127](https://github.com/JabRef/jabref/issues/11127)
Expand Down
3 changes: 1 addition & 2 deletions src/main/java/org/jabref/gui/actions/StandardActions.java
Original file line number Diff line number Diff line change
Expand Up @@ -119,8 +119,7 @@ public enum StandardActions implements Action {
CITATION_KEY_PATTERN(Localization.lang("Citation key patterns")),
SHOW_PREFS(Localization.lang("Preferences"), IconTheme.JabRefIcons.PREFERENCES, KeyBinding.SHOW_PREFS),
MANAGE_JOURNALS(Localization.lang("Manage journal abbreviations")),
CUSTOMIZE_KEYBINDING(Localization.lang("Customize key bindings"), IconTheme.JabRefIcons.KEY_BINDINGS),

CUSTOMIZE_KEYBINDING(Localization.lang("Customize keyboard shortcuts"), IconTheme.JabRefIcons.KEY_BINDINGS),
EDIT_ENTRY(Localization.lang("Open entry editor"), IconTheme.JabRefIcons.EDIT_ENTRY, KeyBinding.EDIT_ENTRY),
SHOW_PDF_VIEWER(Localization.lang("Open document viewer"), IconTheme.JabRefIcons.PDF_FILE),
NEXT_PREVIEW_STYLE(Localization.lang("Next preview style"), KeyBinding.NEXT_PREVIEW_LAYOUT),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
xmlns="http://javafx.com/javafx" xmlns:fx="http://javafx.com/fxml"
fx:controller="org.jabref.gui.preferences.keybindings.KeyBindingsTab">

<Label styleClass="titleHeader" text="%Key bindings"/>
<Label styleClass="titleHeader" text="%Keyboard shortcuts"/>

<TreeTableView fx:id="keyBindingsTable" showRoot="false" styleClass="keybinding-table">
<columns>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ public KeyBindingsTab() {

@Override
public String getTabName() {
return Localization.lang("Key bindings");
return Localization.lang("Keyboard shortcuts");
}

@FXML
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -88,13 +88,13 @@ public void storeSettings() {
preferences.storeKeyBindingRepository(keyBindingRepository);

if (!keyBindingRepository.equals(initialKeyBindingRepository)) {
restartWarning.add(Localization.lang("Key bindings changed"));
restartWarning.add(Localization.lang("Keyboard shortcuts changed"));
}
}

public void resetToDefault() {
String title = Localization.lang("Resetting all key bindings");
String content = Localization.lang("All key bindings will be reset to their defaults.");
String title = Localization.lang("Resetting all keyboard shortcuts");
String content = Localization.lang("All keyboard shortcuts will be reset to their defaults.");
ButtonType resetButtonType = new ButtonType("Reset", ButtonBar.ButtonData.OK_DONE);
dialogService.showCustomButtonDialogAndWait(Alert.AlertType.INFORMATION, title, content, resetButtonType,
ButtonType.CANCEL).ifPresent(response -> {
Expand Down
12 changes: 6 additions & 6 deletions src/main/resources/l10n/JabRef_en.properties
Original file line number Diff line number Diff line change
Expand Up @@ -219,7 +219,7 @@ Custom\ entry\ types\ found\ in\ file=Custom entry types found in file

Customize\ entry\ types=Customize entry types

Customize\ key\ bindings=Customize key bindings
Customize\ keyboard\ shortcuts=Customize keyboard shortcuts

Cut=Cut

Expand Down Expand Up @@ -507,11 +507,11 @@ Keep\ both=Keep both

Keep\ subgroups=Keep subgroups

Key\ bindings=Key bindings
Key\ pattern=Key pattern

Key\ bindings\ changed=Key bindings changed
Keyboard\ shortcuts=Keyboard shortcuts

Key\ pattern=Key pattern
Keyboard\ shortcuts\ changed=Keyboard shortcuts changed

keys\ in\ library=keys in library

Expand Down Expand Up @@ -1247,13 +1247,13 @@ You\ have\ to\ choose\ exactly\ two\ entries\ to\ merge.=You have to choose exac

Add\ timestamp\ to\ modified\ entries\ (field\ "modificationdate")=Add timestamp to modified entries (field "modificationdate")
Add\ timestamp\ to\ new\ entries\ (field\ "creationdate")=Add timestamp to new entries (field "creationdate")
All\ key\ bindings\ will\ be\ reset\ to\ their\ defaults.=All key bindings will be reset to their defaults.
All\ keyboard\ shortcuts\ will\ be\ reset\ to\ their\ defaults.=All keyboard shortcuts will be reset to their defaults.

Automatically\ set\ file\ links=Automatically set file links
Finished\ automatically\ setting\ external\ links.=Finished automatically setting external links.
Changed\ %0\ entries.=Changed %0 entries.

Resetting\ all\ key\ bindings=Resetting all key bindings
Resetting\ all\ keyboard\ shortcuts=Resetting all keyboard shortcuts

Open\ folder=Open folder
Export\ sort\ order=Export sort order
Expand Down

0 comments on commit 74c8917

Please sign in to comment.