Skip to content

BugReporter: extract Localizer messages #10934

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Hanmac merged 2 commits into from
Jun 16, 2026
Merged

BugReporter: extract Localizer messages #10934

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
07de670
BugReporter: extract Localizer messages
Hanmac Jun 9, 2026
a1bfadd
~ fix umport
Hanmac Jun 9, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 6 additions & 5 deletions forge-gui-desktop/src/main/java/forge/error/BugReportDialog.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

/**
Expand Down Expand Up @@ -72,9 +73,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()));
}
Expand Down Expand Up @@ -106,7 +107,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()));
}

Expand All @@ -122,7 +123,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;
}
Expand All @@ -136,7 +137,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()));
}

Expand Down
9 changes: 5 additions & 4 deletions forge-gui-mobile/src/forge/error/BugReportDialog.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand All @@ -31,10 +32,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);
Expand Down
6 changes: 0 additions & 6 deletions forge-gui/src/main/java/forge/gui/error/BugReporter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
Loading