Minor wording changes (#259)

QuiltMC · Feb 24, 2025 · 6180d77 · 6180d77
1 parent bf5a6e6
commit 6180d77
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 6 deletions.
diff --git a/enigma-swing/src/main/java/org/quiltmc/enigma/gui/Gui.java b/enigma-swing/src/main/java/org/quiltmc/enigma/gui/Gui.java
@@ -524,7 +524,7 @@ public void close() {
 				}
 
 				return null;
-			}, I18n.translate("prompt.save"), I18n.translate("prompt.close.discard"), I18n.translate("prompt.cancel"));
+			}, I18n.translate("prompt.close.save"), I18n.translate("prompt.close.discard"), I18n.translate("prompt.cancel"));
 		}
 	}
 

diff --git a/enigma-swing/src/main/java/org/quiltmc/enigma/gui/element/MenuBar.java b/enigma-swing/src/main/java/org/quiltmc/enigma/gui/element/MenuBar.java
@@ -328,7 +328,7 @@ private void onSaveMappingsClicked() {
 		this.gui.getController().saveMappings(this.gui.mappingsFileChooser.getSelectedFile().toPath());
 	}
 
-	private void openMappingsDiscardPrompt(Runnable then) {
+	private void openMappingsDiscardPrompt(Runnable then, boolean isReload) {
 		if (this.gui.getController().isDirty()) {
 			this.gui.showDiscardDiag((response -> {
 				if (response == JOptionPane.YES_OPTION) {
@@ -338,22 +338,22 @@ private void openMappingsDiscardPrompt(Runnable then) {
 				}
 
 				return null;
-			}), I18n.translate("prompt.close.save"), I18n.translate("prompt.close.discard"), I18n.translate("prompt.cancel"));
+			}), I18n.translate(isReload ? "prompt.close.save_and_reload" : "prompt.close.save"), I18n.translate("prompt.close.discard"), I18n.translate("prompt.cancel"));
 		} else {
 			then.run();
 		}
 	}
 
 	private void onCloseMappingsClicked() {
-		this.openMappingsDiscardPrompt(() -> this.gui.getController().closeMappings());
+		this.openMappingsDiscardPrompt(() -> this.gui.getController().closeMappings(), false);
 	}
 
 	private void onReloadMappingsClicked() {
-		this.openMappingsDiscardPrompt(() -> this.gui.getController().reloadMappings());
+		this.openMappingsDiscardPrompt(() -> this.gui.getController().reloadMappings(), true);
 	}
 
 	private void onReloadAllClicked() {
-		this.openMappingsDiscardPrompt(() -> this.gui.getController().reloadAll());
+		this.openMappingsDiscardPrompt(() -> this.gui.getController().reloadAll(), true);
 	}
 
 	private void onExportSourceClicked() {

diff --git a/enigma/src/main/resources/lang/en_us.json b/enigma/src/main/resources/lang/en_us.json
@@ -244,6 +244,7 @@
 	"prompt.close.title": "Save your changes?",
 	"prompt.close.summary": "Your mappings have not been saved yet. Do you want to save?",
 	"prompt.close.save": "Save and close",
+	"prompt.close.save_and_reload": "Save and reload",
 	"prompt.close.discard": "Discard changes",
 	"prompt.connect.title": "Connect to Server",
 	"prompt.connect.username": "Username:",
-Original file line number
+Diff line change
@@ Expand Up / @@ -524,7 +524,7 @@ public void close() { @@
     				}
     				return null;
-    			}, I18n.translate("prompt.save"), I18n.translate("prompt.close.discard"), I18n.translate("prompt.cancel"));
+    			}, I18n.translate("prompt.close.save"), I18n.translate("prompt.close.discard"), I18n.translate("prompt.cancel"));
     		}
     	}
@@ Expand Down @@