Skip to content

Commit 6837164

Browse files
authored
Change export to save (#7518)
* fix: change save and export * fix: remove method changeExportDescriptionToSave * fix: remove method changeExportDescriptionToSave * fix: remove unused import
1 parent aa4c393 commit 6837164

File tree

5 files changed

+7
-21
lines changed

5 files changed

+7
-21
lines changed

src/main/java/org/jabref/gui/commonfxcontrols/SaveOrderConfigPanel.fxml

+3-3
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,12 @@
1616
<ToggleGroup fx:id="saveOrderToggleGroup"/>
1717
</fx:define>
1818

19-
<RadioButton fx:id="exportInOriginalOrder" text="%Export entries in their original order"
19+
<RadioButton fx:id="exportInOriginalOrder" text="%Keep original order"
2020
toggleGroup="$saveOrderToggleGroup"/>
21-
<RadioButton fx:id="exportInTableOrder" text="%Export in current table sort order"
21+
<RadioButton fx:id="exportInTableOrder" text="%Use current table sort order"
2222
toggleGroup="$saveOrderToggleGroup"/>
2323
<RadioButton fx:id="exportInSpecifiedOrder"
24-
text="%Export entries ordered as specified" toggleGroup="$saveOrderToggleGroup"/>
24+
text="%Use specified order" toggleGroup="$saveOrderToggleGroup"/>
2525

2626
<GridPane hgap="10.0" vgap="4.0">
2727
<columnConstraints>

src/main/java/org/jabref/gui/commonfxcontrols/SaveOrderConfigPanel.java

-7
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111

1212
import org.jabref.gui.util.FieldsUtil;
1313
import org.jabref.gui.util.ViewModelListCellFactory;
14-
import org.jabref.logic.l10n.Localization;
1514
import org.jabref.model.entry.field.Field;
1615

1716
import com.airhacks.afterburner.views.ViewLoader;
@@ -70,12 +69,6 @@ private void initialize() {
7069
saveTerDesc.selectedProperty().bindBidirectional(viewModel.saveTertiaryDescPropertySelected());
7170
}
7271

73-
public void changeExportDescriptionToSave() {
74-
exportInOriginalOrder.setText(Localization.lang("Save entries in their original order"));
75-
exportInSpecifiedOrder.setText(Localization.lang("Save entries ordered as specified"));
76-
exportInTableOrder.setText(Localization.lang("Save in current table sort order"));
77-
}
78-
7972
public BooleanProperty saveInOriginalProperty() {
8073
return viewModel.saveInOriginalProperty();
8174
}

src/main/java/org/jabref/gui/libraryproperties/LibraryPropertiesDialog.fxml

+1-1
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@
8080
<CheckBox fx:id="protect"
8181
text="%Refuse to save the library before external changes have been reviewed."/>
8282

83-
<Label styleClass="sectionHeader" text="%Export sort order"/>
83+
<Label styleClass="sectionHeader" text="%Save sort order"/>
8484
<SaveOrderConfigPanel fx:id="saveOrderConfigPanel"/>
8585

8686
<Label styleClass="sectionHeader" text="%Save actions"/>

src/main/java/org/jabref/gui/libraryproperties/LibraryPropertiesDialogView.java

-1
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,6 @@ private void initialize() {
7979
protect.disableProperty().bind(viewModel.protectDisableProperty());
8080
protect.selectedProperty().bindBidirectional(viewModel.libraryProtectedProperty());
8181

82-
saveOrderConfigPanel.changeExportDescriptionToSave();
8382
saveOrderConfigPanel.saveInOriginalProperty().bindBidirectional(viewModel.saveInOriginalProperty());
8483
saveOrderConfigPanel.saveInTableOrderProperty().bindBidirectional(viewModel.saveInTableOrderProperty());
8584
saveOrderConfigPanel.saveInSpecifiedOrderProperty().bindBidirectional(viewModel.saveInSpecifiedOrderProperty());

src/main/resources/l10n/JabRef_en.properties

+3-9
Original file line numberDiff line numberDiff line change
@@ -736,8 +736,6 @@ Save\ before\ closing=Save before closing
736736
Save\ library=Save library
737737
Save\ library\ as...=Save library as...
738738

739-
Save\ entries\ in\ their\ original\ order=Save entries in their original order
740-
741739
Saved\ selected\ to\ '%0'.=Saved selected to '%0'.
742740

743741
Saving=Saving
@@ -956,10 +954,6 @@ A\ local\ copy\ will\ be\ opened.=A local copy will be opened.
956954
Autosave\ local\ libraries=Autosave local libraries
957955
Automatically\ save\ the\ library\ to=Automatically save the library to
958956
Please\ enter\ a\ valid\ file\ path.=Please enter a valid file path.
959-
960-
961-
Export\ in\ current\ table\ sort\ order=Export in current table sort order
962-
Export\ entries\ in\ their\ original\ order=Export entries in their original order
963957
Error\ opening\ file\ '%0'.=Error opening file '%0'.
964958

965959
Formatter\ not\ found\:\ %0=Formatter not found: %0
@@ -1196,13 +1190,13 @@ Attention\:\ Password\ is\ stored\ in\ plain\ text\!=Attention: Password is stor
11961190
Clear\ connection\ settings=Clear connection settings
11971191

11981192
Open\ folder=Open folder
1199-
Export\ entries\ ordered\ as\ specified=Export entries ordered as specified
12001193
Export\ sort\ order=Export sort order
12011194
Save\ sort\ order=Save sort order
12021195
Newline\ separator=Newline separator
12031196

1204-
Save\ in\ current\ table\ sort\ order=Save in current table sort order
1205-
Save\ entries\ ordered\ as\ specified=Save entries ordered as specified
1197+
Keep\ original\ order=Keep original order
1198+
Use\ current\ table\ sort\ order=Use current table sort order
1199+
Use\ specified\ order=Use specified order
12061200
Show\ extra\ columns=Show extra columns
12071201
Parsing\ error=Parsing error
12081202
illegal\ backslash\ expression=illegal backslash expression

0 commit comments

Comments
 (0)