make 'tooltips' consistently plural in user-facing strings

Author: supersaiyansubtlety

enigma-swing/src/main/java/org/quiltmc/enigma/gui/config/EditorConfig.java

@@ -11,6 +11,6 @@ public class EditorConfig extends ReflectiveConfig {
 	@Comment("Whether editors' quick find toolbars should remain visible when they lose focus.")
 	public final TrackedValue<Boolean> persistentQuickFind = this.value(true);
 
-	@Comment("Settings for the editor's entry tooltip.")
-	public final EntryTooltipSection entryTooltip = new EntryTooltipSection();
+	@Comment("Settings for editors' entry tooltips.")
+	public final EntryTooltipsSection entryTooltips = new EntryTooltipsSection();
 }

…igma/gui/config/EntryTooltipSection.java …gma/gui/config/EntryTooltipsSection.javaenigma-swing/src/main/java/org/quiltmc/enigma/gui/config/EntryTooltipSection.java renamed to enigma-swing/src/main/java/org/quiltmc/enigma/gui/config/EntryTooltipsSection.java enigma-swing/src/main/java/org/quiltmc/enigma/gui/config/EntryTooltipSection.java renamed to enigma-swing/src/main/java/org/quiltmc/enigma/gui/config/EntryTooltipsSection.java

@@ -7,7 +7,7 @@
 import org.quiltmc.config.api.values.TrackedValue;
 
 @SerializedNameConvention(NamingSchemes.SNAKE_CASE)
-public class EntryTooltipSection extends ReflectiveConfig.Section {
+public class EntryTooltipsSection extends ReflectiveConfig.Section {
 	@Comment("Whether tooltips are enabled.")
 	public final TrackedValue<Boolean> enable = this.value(true);
 

…ment/menu_bar/view/EntryTooltipMenu.java …ent/menu_bar/view/EntryTooltipsMenu.javaenigma-swing/src/main/java/org/quiltmc/enigma/gui/element/menu_bar/view/EntryTooltipMenu.java renamed to enigma-swing/src/main/java/org/quiltmc/enigma/gui/element/menu_bar/view/EntryTooltipsMenu.java enigma-swing/src/main/java/org/quiltmc/enigma/gui/element/menu_bar/view/EntryTooltipMenu.java renamed to enigma-swing/src/main/java/org/quiltmc/enigma/gui/element/menu_bar/view/EntryTooltipsMenu.java

@@ -9,11 +9,11 @@
 
 import static org.quiltmc.enigma.gui.util.GuiUtil.createSyncedMenuCheckBox;
 
-public class EntryTooltipMenu extends AbstractEnigmaMenu {
-	private final JCheckBoxMenuItem enable = createSyncedMenuCheckBox(Config.editor().entryTooltip.enable);
-	private final JCheckBoxMenuItem interactable = createSyncedMenuCheckBox(Config.editor().entryTooltip.interactable);
+public class EntryTooltipsMenu extends AbstractEnigmaMenu {
+	private final JCheckBoxMenuItem enable = createSyncedMenuCheckBox(Config.editor().entryTooltips.enable);
+	private final JCheckBoxMenuItem interactable = createSyncedMenuCheckBox(Config.editor().entryTooltips.interactable);
 
-	protected EntryTooltipMenu(Gui gui) {
+	protected EntryTooltipsMenu(Gui gui) {
 		super(gui);
 
 		this.add(this.enable);
@@ -24,8 +24,8 @@ protected EntryTooltipMenu(Gui gui) {
 
 	@Override
 	public void retranslate() {
-		this.setText(I18n.translate("menu.view.entry_tooltip"));
-		this.enable.setText(I18n.translate("menu.view.entry_tooltip.enable"));
-		this.interactable.setText(I18n.translate("menu.view.entry_tooltip.interactable"));
+		this.setText(I18n.translate("menu.view.entry_tooltips"));
+		this.enable.setText(I18n.translate("menu.view.entry_tooltips.enable"));
+		this.interactable.setText(I18n.translate("menu.view.entry_tooltips.interactable"));
 	}
 }

enigma-swing/src/main/java/org/quiltmc/enigma/gui/element/menu_bar/view/ViewMenu.java

@@ -14,7 +14,7 @@ public class ViewMenu extends AbstractEnigmaMenu {
 	private final LanguagesMenu languages;
 	private final ThemesMenu themes;
 	private final ScaleMenu scale;
-	private final EntryTooltipMenu entryTooltip;
+	private final EntryTooltipsMenu entryTooltips;
 
 	private final JMenuItem fontItem = new JMenuItem();
 
@@ -25,14 +25,14 @@ public ViewMenu(Gui gui) {
 		this.languages = new LanguagesMenu(gui);
 		this.themes = new ThemesMenu(gui);
 		this.scale = new ScaleMenu(gui);
-		this.entryTooltip = new EntryTooltipMenu(gui);
+		this.entryTooltips = new EntryTooltipsMenu(gui);
 
 		this.add(this.themes);
 		this.add(this.languages);
 		this.add(this.notifications);
 		this.add(this.scale);
 		this.add(this.stats);
-		this.add(this.entryTooltip);
+		this.add(this.entryTooltips);
 		this.add(this.fontItem);
 
 		this.fontItem.addActionListener(e -> this.onFontClicked(this.gui));
@@ -47,7 +47,7 @@ public void retranslate() {
 		this.languages.retranslate();
 		this.scale.retranslate();
 		this.stats.retranslate();
-		this.entryTooltip.retranslate();
+		this.entryTooltips.retranslate();
 		this.fontItem.setText(I18n.translate("menu.view.font"));
 	}
 

enigma-swing/src/main/java/org/quiltmc/enigma/gui/panel/EditorPanel.java

@@ -318,7 +318,7 @@ public void windowLostFocus(WindowEvent e) {
 		// This also reduces the chances of accidentally updating the tooltip with
 		// a new entry's content as you move your mouse to the tooltip.
 		final Timer mouseStoppedMovingTimer = new Timer(MOUSE_STOPPED_MOVING_DELAY, e -> {
-			if (Config.editor().entryTooltip.enable.value()) {
+			if (Config.editor().entryTooltips.enable.value()) {
 				EditorPanel.this.consumeEditorMouseTarget(
 						(token, entry, resolvedParent) -> {
 							this.hideTimer.stop();
@@ -376,7 +376,7 @@ public void windowLostFocus(WindowEvent e) {
 			this.entryTooltip.addMouseMotionListener(new MouseAdapter() {
 				@Override
 				public void mouseMoved(MouseEvent e) {
-					if (Config.editor().entryTooltip.interactable.value()) {
+					if (Config.editor().entryTooltips.interactable.value()) {
 						TooltipManager.this.mouseStoppedMovingTimer.stop();
 						TooltipManager.this.hideTimer.stop();
 					}

enigma-swing/src/main/java/org/quiltmc/enigma/gui/panel/EntryTooltip.java

@@ -124,7 +124,7 @@ public EntryTooltip(Gui gui) {
 		this.addMouseListener(new MouseAdapter() {
 			@Override
 			public void mousePressed(MouseEvent e) {
-				if (Config.editor().entryTooltip.interactable.value()) {
+				if (Config.editor().entryTooltips.interactable.value()) {
 					EntryTooltip.this.dragStart = e.getButton() == MouseEvent.BUTTON1
 							? new Point(e.getX(), e.getY())
 							: null;
@@ -196,7 +196,7 @@ private void populateWith(Entry<?> target, boolean inherited, boolean opening) {
 		this.content.removeAll();
 
 		@Nullable
-		final MouseAdapter stopInteraction = Config.editor().entryTooltip.interactable.value()
+		final MouseAdapter stopInteraction = Config.editor().entryTooltips.interactable.value()
 				? null : new MouseAdapter() {
 					@Override
 					public void mousePressed(MouseEvent e) {

enigma/src/main/resources/lang/en_us.json

@@ -82,9 +82,9 @@
 	"menu.view.stat_icons.count_fallback": "Count fallback-proposed names",
 	"menu.view.stat_icons.included_types": "Included types",
 	"menu.view.stat_icons.enable_icons": "Enable icons",
-	"menu.view.entry_tooltip": "Entry Tooltip",
-	"menu.view.entry_tooltip.enable": "Enable tooltip",
-	"menu.view.entry_tooltip.interactable": "Allow tooltip interaction",
+	"menu.view.entry_tooltips": "Entry Tooltips",
+	"menu.view.entry_tooltips.enable": "Enable tooltips",
+	"menu.view.entry_tooltips.interactable": "Allow tooltip interaction",
 	"menu.view.font": "Fonts...",
 	"menu.view.change.title": "Changes",
 	"menu.view.change.summary": "Changes will be applied after the next restart.",