From 07de6709dbb0aabeb2277cf0e1e27d203808aea4 Mon Sep 17 00:00:00 2001 From: Hans Mackowiak Date: Tue, 9 Jun 2026 08:29:25 +0000 Subject: [PATCH 1/2] BugReporter: extract Localizer messages --- .../src/main/java/forge/error/BugReportDialog.java | 10 +++++----- forge-gui-mobile/src/forge/error/BugReportDialog.java | 8 ++++---- .../src/main/java/forge/gui/error/BugReporter.java | 6 ------ 3 files changed, 9 insertions(+), 15 deletions(-) diff --git a/forge-gui-desktop/src/main/java/forge/error/BugReportDialog.java b/forge-gui-desktop/src/main/java/forge/error/BugReportDialog.java index 58fe2a7048d9..5921beae87a0 100644 --- a/forge-gui-desktop/src/main/java/forge/error/BugReportDialog.java +++ b/forge-gui-desktop/src/main/java/forge/error/BugReportDialog.java @@ -72,9 +72,9 @@ public static void show(String title, String text, boolean showExitAppBtn) { options.add(new JButton(new _Report())); // option to enable automatic Sentry submission options.add(new JCheckBox(new _ActivateSentry())); - options.add(new JLabel(BugReporter.SENTRY)); + options.add(new JLabel(Localizer.getInstance().getMessage("lblAutoSubmitBugReports"))); options.add(new JButton(new _SaveAction(area))); - options.add(BugReporter.DISCARD); + options.add(Localizer.getInstance().getMessage("lblDiscardError")); if (showExitAppBtn) { options.add(new JButton(new _ExitAction())); } @@ -106,7 +106,7 @@ public void actionPerformed(final ActionEvent actionEvent) { private static class _Report extends AbstractAction { public _Report() { - super(BugReporter.REPORT); + super(Localizer.getInstance().getMessage("lblReport")); this.putValue(Action.ACCELERATOR_KEY, KeyStroke.getKeyStroke(KeyEvent.VK_R, Toolkit.getDefaultToolkit().getMenuShortcutKeyMask())); } @@ -122,7 +122,7 @@ private static class _SaveAction extends AbstractAction { private final JTextArea area; public _SaveAction(final JTextArea areaParam) { - super(BugReporter.SAVE); + super(Localizer.getInstance().getMessage("lblSave")); this.putValue(Action.ACCELERATOR_KEY, KeyStroke.getKeyStroke(KeyEvent.VK_S, Toolkit.getDefaultToolkit().getMenuShortcutKeyMask())); this.area = areaParam; } @@ -136,7 +136,7 @@ public void actionPerformed(final ActionEvent e) { @SuppressWarnings("serial") private static class _ExitAction extends AbstractAction { public _ExitAction() { - super(BugReporter.EXIT); + super(Localizer.getInstance().getMessage("lblExit")); this.putValue(Action.ACCELERATOR_KEY, KeyStroke.getKeyStroke(KeyEvent.VK_X, Toolkit.getDefaultToolkit().getMenuShortcutKeyMask())); } diff --git a/forge-gui-mobile/src/forge/error/BugReportDialog.java b/forge-gui-mobile/src/forge/error/BugReportDialog.java index e56e4d7c3770..1c4284ff9ca1 100644 --- a/forge-gui-mobile/src/forge/error/BugReportDialog.java +++ b/forge-gui-mobile/src/forge/error/BugReportDialog.java @@ -31,10 +31,10 @@ public static void show(String title, String text, boolean showExitAppBtn) { private final FTextArea lblHeader = add(new FTextArea(false, "Report Bug")); private final TemplateView tvDetails; - private final FButton btnReport = add(new FButton(BugReporter.REPORT)); - private final FButton btnSave = add(new FButton(BugReporter.SAVE)); - private final FButton btnDiscard = add(new FButton(BugReporter.DISCARD)); - private final FButton btnExit = add(new FButton(BugReporter.EXIT)); + private final FButton btnReport = add(new FButton(Localizer.getInstance().getMessage("lblReport"))); + private final FButton btnSave = add(new FButton(Localizer.getInstance().getMessage("lblSave"))); + private final FButton btnDiscard = add(new FButton(Localizer.getInstance().getMessage("lblDiscardError"))); + private final FButton btnExit = add(new FButton(Localizer.getInstance().getMessage("lblExit"))); private BugReportDialog(String title, String text0, boolean showExitAppBtn) { super(title); diff --git a/forge-gui/src/main/java/forge/gui/error/BugReporter.java b/forge-gui/src/main/java/forge/gui/error/BugReporter.java index 92f27cc54b80..8fede35e7c6d 100644 --- a/forge-gui/src/main/java/forge/gui/error/BugReporter.java +++ b/forge-gui/src/main/java/forge/gui/error/BugReporter.java @@ -39,12 +39,6 @@ public class BugReporter { private static final int STACK_OVERFLOW_MAX_MESSAGE_LEN = 16 * 1024; - public static final String REPORT = Localizer.getInstance().getMessage("lblReport"); - public static final String SAVE = Localizer.getInstance().getMessage("lblSave"); - public static final String DISCARD = Localizer.getInstance().getMessage("lblDiscardError"); - public static final String EXIT = Localizer.getInstance().getMessage("lblExit"); - public static final String SENTRY = Localizer.getInstance().getMessage("lblAutoSubmitBugReports"); - private static Throwable exception; private static String message; From a1bfaddfb8dbaa4844a73b39d82939c4449dd901 Mon Sep 17 00:00:00 2001 From: Hans Mackowiak Date: Tue, 9 Jun 2026 08:55:00 +0000 Subject: [PATCH 2/2] ~ fix umport --- forge-gui-desktop/src/main/java/forge/error/BugReportDialog.java | 1 + forge-gui-mobile/src/forge/error/BugReportDialog.java | 1 + 2 files changed, 2 insertions(+) diff --git a/forge-gui-desktop/src/main/java/forge/error/BugReportDialog.java b/forge-gui-desktop/src/main/java/forge/error/BugReportDialog.java index 5921beae87a0..bbff01234a56 100644 --- a/forge-gui-desktop/src/main/java/forge/error/BugReportDialog.java +++ b/forge-gui-desktop/src/main/java/forge/error/BugReportDialog.java @@ -41,6 +41,7 @@ import forge.gui.error.BugReporter; import forge.localinstance.properties.ForgePreferences; import forge.model.FModel; +import forge.util.Localizer; import net.miginfocom.swing.MigLayout; /** diff --git a/forge-gui-mobile/src/forge/error/BugReportDialog.java b/forge-gui-mobile/src/forge/error/BugReportDialog.java index 1c4284ff9ca1..9dc5c7421ecc 100644 --- a/forge-gui-mobile/src/forge/error/BugReportDialog.java +++ b/forge-gui-mobile/src/forge/error/BugReportDialog.java @@ -12,6 +12,7 @@ import forge.toolbox.FButton; import forge.toolbox.FScrollPane; import forge.toolbox.FTextArea; +import forge.util.Localizer; import forge.util.TextBounds; import forge.util.Utils;