From 82e520ca6768d055c4f85574b47febe7eae94bd3 Mon Sep 17 00:00:00 2001 From: CCTV-1 Date: Tue, 25 Feb 2020 12:24:22 +0800 Subject: [PATCH] translate desktop sideboard dialog message --- .../src/main/java/forge/game/Match.java | 3 +-- .../src/main/java/forge/gui/GuiChoose.java | 19 ++++++++++--------- .../java/forge/match/AbstractGuiGame.java | 8 ++++---- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/forge-game/src/main/java/forge/game/Match.java b/forge-game/src/main/java/forge/game/Match.java index 1ef3b279a23..dd6f8939e70 100644 --- a/forge-game/src/main/java/forge/game/Match.java +++ b/forge-game/src/main/java/forge/game/Match.java @@ -241,9 +241,8 @@ public class Match { person = sideboardProxy; } - String forPlayer = " for " + player.getName(); Deck toChange = psc.getDeck(); - List newMain = person.sideboard(toChange, rules.getGameType(), forPlayer); + List newMain = person.sideboard(toChange, rules.getGameType(), player.getName()); if (null != newMain) { CardPool allCards = new CardPool(); allCards.addAll(toChange.get(DeckSection.Main)); diff --git a/forge-gui-desktop/src/main/java/forge/gui/GuiChoose.java b/forge-gui-desktop/src/main/java/forge/gui/GuiChoose.java index c99b4cb6ab6..ad393561839 100644 --- a/forge-gui-desktop/src/main/java/forge/gui/GuiChoose.java +++ b/forge-gui-desktop/src/main/java/forge/gui/GuiChoose.java @@ -30,6 +30,7 @@ import forge.model.FModel; import forge.screens.match.CMatchUI; import forge.toolbox.FOptionPane; import forge.view.arcane.ListCardArea; +import forge.util.Localizer; public class GuiChoose { @@ -83,6 +84,7 @@ public class GuiChoose { return GuiChoose.oneOrNone(message, choices); } public static Integer getInteger(final String message, final int min, final int max, final int cutoff) { + final Localizer localizer = Localizer.getInstance(); if (max <= min || cutoff < min) { return min; } //just return min if max <= min or cutoff < min if (cutoff >= max) { //fallback to regular integer prompt if cutoff at or after max @@ -93,7 +95,7 @@ public class GuiChoose { for (int i = min; i <= cutoff; i++) { choices.add(Integer.valueOf(i)); } - choices.add("Other..."); + choices.add(Localizer.getInstance().getMessage("lblOtherInteger")); final Object choice = GuiChoose.oneOrNone(message, choices); if (choice instanceof Integer || choice == null) { @@ -101,19 +103,18 @@ public class GuiChoose { } //if Other option picked, prompt for number input - String prompt = "Enter a number"; + String prompt = ""; if (min != Integer.MIN_VALUE) { if (max != Integer.MAX_VALUE) { - prompt += " between " + min + " and " + max; + prompt = localizer.getMessage("lblEnterNumberBetweenMinAndMax", String.valueOf(min), String.valueOf(max)); } else { - prompt += " greater than or equal to " + min; + prompt = localizer.getMessage("lblEnterNumberGreaterThanOrEqualsToMin", String.valueOf(min)); } } else if (max != Integer.MAX_VALUE) { - prompt += " less than or equal to " + max; + prompt = localizer.getMessage("lblEnterNumberLessThanOrEqualsToMax", String.valueOf(max)); } - prompt += ":"; while (true) { final String str = FOptionPane.showInputDialog(prompt, message); @@ -237,7 +238,7 @@ public class GuiChoose { public static > List sideboard(final CMatchUI matchUI, final List sideboard, final List deck, final String message) { Collections.sort(deck); Collections.sort(sideboard); - return order("Sideboard" + message, "Main Deck", -1, -1, sideboard, deck, null, true, matchUI); + return order(Localizer.getInstance().getMessage("lblSideboardForPlayer", message), Localizer.getInstance().getMessage("ttMain"), -1, -1, sideboard, deck, null, true, matchUI); } public static List order(final String title, final String top, final int remainingObjectsMin, final int remainingObjectsMax, @@ -303,8 +304,8 @@ public class GuiChoose { FThreads.invokeInEdtAndWait(ft); gui.clearSelectables(); try { - List result = ft.get(); - return result; + List result = ft.get(); + return result; } catch (final Exception e) { // we have waited enough e.printStackTrace(); } diff --git a/forge-gui/src/main/java/forge/match/AbstractGuiGame.java b/forge-gui/src/main/java/forge/match/AbstractGuiGame.java index d155759e9c7..71fbc8c4b7c 100644 --- a/forge-gui/src/main/java/forge/match/AbstractGuiGame.java +++ b/forge-gui/src/main/java/forge/match/AbstractGuiGame.java @@ -569,7 +569,7 @@ public abstract class AbstractGuiGame implements IGuiGame, IMayViewCards { for (int i = min; i <= cutoff; i++) { choices.add(Integer.valueOf(i)); } - choices.add("..."); + choices.add(Localizer.getInstance().getMessage("lblOtherInteger")); final Object choice = oneOrNone(message, choices.build()); if (choice instanceof Integer || choice == null) { @@ -581,12 +581,12 @@ public abstract class AbstractGuiGame implements IGuiGame, IMayViewCards { String prompt = ""; if (min != Integer.MIN_VALUE) { if (max != Integer.MAX_VALUE) { - prompt = localizer.getMessage("lblEnterNumberBetweenMinAndMax").replace("%min", String.valueOf(min)).replace("%max", String.valueOf(max)); + prompt = localizer.getMessage("lblEnterNumberBetweenMinAndMax", String.valueOf(min), String.valueOf(max)); } else { - prompt = localizer.getMessage("lblEnterNumberGreaterThanOrEqualsToMin").replace("%min", String.valueOf(min)); + prompt = localizer.getMessage("lblEnterNumberGreaterThanOrEqualsToMin", String.valueOf(min)); } } else if (max != Integer.MAX_VALUE) { - prompt = localizer.getMessage("lblEnterNumberLessThanOrEqualsToMax").replace("%max", String.valueOf(max)); + prompt = localizer.getMessage("lblEnterNumberLessThanOrEqualsToMax", String.valueOf(max)); } while (true) {