diff options
3 files changed, 3 insertions, 7 deletions
diff --git a/src/main/java/dev/isxander/yacl/gui/YACLScreen.java b/src/main/java/dev/isxander/yacl/gui/YACLScreen.java index 5263c57..e49d544 100644 --- a/src/main/java/dev/isxander/yacl/gui/YACLScreen.java +++ b/src/main/java/dev/isxander/yacl/gui/YACLScreen.java @@ -138,7 +138,7 @@ public class YACLScreen extends Screen { undoButton.active = pendingChanges; finishedSaveButton.setMessage(pendingChanges ? Text.translatable("yacl.gui.save") : Text.translatable("yacl.gui.finished")); finishedSaveButton.setTooltip(pendingChanges ? Text.translatable("yacl.gui.save.tooltip") : Text.translatable("yacl.gui.finished.tooltip")); - cancelResetButton.setMessage(pendingChanges ? Text.translatable("yacl.gui.cancel") : Text.translatable("yacl.gui.reset")); + cancelResetButton.setMessage(pendingChanges ? Text.translatable("gui.cancel") : Text.translatable("controls.reset")); cancelResetButton.setTooltip(pendingChanges ? Text.translatable("yacl.gui.cancel.tooltip") : Text.translatable("yacl.gui.reset.tooltip")); } diff --git a/src/main/java/dev/isxander/yacl/gui/controllers/BooleanController.java b/src/main/java/dev/isxander/yacl/gui/controllers/BooleanController.java index fc3120e..a338f5f 100644 --- a/src/main/java/dev/isxander/yacl/gui/controllers/BooleanController.java +++ b/src/main/java/dev/isxander/yacl/gui/controllers/BooleanController.java @@ -30,8 +30,8 @@ public class BooleanController implements Controller<Boolean> { public static final Function<Boolean, Text> YES_NO_FORMATTER = (state) -> state - ? Text.translatable("yacl.control.boolean.yes") - : Text.translatable("yacl.control.boolean.no"); + ? Text.translatable("gui.yes") + : Text.translatable("gui.no"); private final Option<Boolean> option; private final Function<Boolean, Text> valueFormatter; diff --git a/src/main/resources/assets/yet-another-config-lib/lang/en_us.json b/src/main/resources/assets/yet-another-config-lib/lang/en_us.json index fa3cc91..fd066db 100644 --- a/src/main/resources/assets/yet-another-config-lib/lang/en_us.json +++ b/src/main/resources/assets/yet-another-config-lib/lang/en_us.json @@ -1,8 +1,6 @@ { "yacl.control.boolean.true": "True", "yacl.control.boolean.false": "False", - "yacl.control.boolean.yes": "Yes", - "yacl.control.boolean.no": "No", "yacl.control.action.execute": "EXECUTE", @@ -10,9 +8,7 @@ "yacl.gui.save.tooltip": "Makes the changes made permanent.", "yacl.gui.finished": "Finished", "yacl.gui.finished.tooltip": "Closes the GUI.", - "yacl.gui.cancel": "Cancel", "yacl.gui.cancel.tooltip": "Forgets pending changes and closes the GUI.", - "yacl.gui.reset": "Reset", "yacl.gui.reset.tooltip": "Resets all options to default. (This is reversible!)", "yacl.gui.undo": "Undo", "yacl.gui.undo.tooltip": "Reverts all options back to what they were before editing.", |