external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-17 03:08:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

translate some text

Browse Source
This commit is contained in:
CCTV-1
2020-01-14 13:18:43 +08:00
parent 3f2d70c315
commit 1a55341dd3
19 changed files with 189 additions and 185 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
forge-game/src/main/java/forge/game/ability/effects/ChangeZoneEffect.java
View File

@@ -810,10 +810,10 @@ public class ChangeZoneEffect extends SpellAbilityEffect {
final int fetchNum = Math.min(player.getCardsIn(ZoneType.Library).size(), 4); final int fetchNum = Math.min(player.getCardsIn(ZoneType.Library).size(), 4);
CardCollectionView shown = !decider.hasKeyword("LimitSearchLibrary") ? player.getCardsIn(ZoneType.Library) : player.getCardsIn(ZoneType.Library, fetchNum); CardCollectionView shown = !decider.hasKeyword("LimitSearchLibrary") ? player.getCardsIn(ZoneType.Library) : player.getCardsIn(ZoneType.Library, fetchNum);
// Look at whole library before moving onto choosing a card // Look at whole library before moving onto choosing a card
delayedReveal = new DelayedReveal(shown, ZoneType.Library, PlayerView.get(player), source.getName() + " - " + Localizer.getInstance().getMessage("lblLookingCardIn") + " "); delayedReveal = new DelayedReveal(shown, ZoneType.Library, PlayerView.get(player), CardTranslation.getTranslatedName(source.getName()) + " - " + Localizer.getInstance().getMessage("lblLookingCardIn") + " ");
} }
else if (origin.contains(ZoneType.Hand) && player.isOpponentOf(decider)) { else if (origin.contains(ZoneType.Hand) && player.isOpponentOf(decider)) {
delayedReveal = new DelayedReveal(player.getCardsIn(ZoneType.Hand), ZoneType.Hand, PlayerView.get(player), source.getName() + " - " + Localizer.getInstance().getMessage("lblLookingCardIn") + " "); delayedReveal = new DelayedReveal(player.getCardsIn(ZoneType.Hand), ZoneType.Hand, PlayerView.get(player), CardTranslation.getTranslatedName(source.getName()) + " - " + Localizer.getInstance().getMessage("lblLookingCardIn") + " ");
} }
} }

5
forge-game/src/main/java/forge/game/ability/effects/DigEffect.java
View File

@@ -24,6 +24,7 @@ import forge.util.Lang;
import forge.util.TextUtil; import forge.util.TextUtil;
import forge.util.collect.FCollectionView; import forge.util.collect.FCollectionView;
import forge.util.Localizer; import forge.util.Localizer;
import forge.util.CardTranslation;
import java.util.*; import java.util.*;
@@ -146,7 +147,7 @@ public class DigEffect extends SpellAbilityEffect {
} }
else if (!sa.hasParam("NoLooking")) { else if (!sa.hasParam("NoLooking")) {
// show the user the revealed cards // show the user the revealed cards
delayedReveal = new DelayedReveal(top, srcZone, PlayerView.get(p), host.getName() + " - " + Localizer.getInstance().getMessage("lblLookingCardIn") + " "); delayedReveal = new DelayedReveal(top, srcZone, PlayerView.get(p), CardTranslation.getTranslatedName(host.getName()) + " - " + Localizer.getInstance().getMessage("lblLookingCardIn") + " ");
if (noMove) { if (noMove) {
// Let the activating player see the cards even if they're not moved // Let the activating player see the cards even if they're not moved
@@ -198,7 +199,7 @@ public class DigEffect extends SpellAbilityEffect {
// Optional abilities that use a dialog box to prompt the user to skip the ability (e.g. Explorer's Scope, Quest for Ula's Temple) // Optional abilities that use a dialog box to prompt the user to skip the ability (e.g. Explorer's Scope, Quest for Ula's Temple)
if (optional && mayBeSkipped && !valid.isEmpty()) { if (optional && mayBeSkipped && !valid.isEmpty()) {
String prompt = !optionalAbilityPrompt.isEmpty() ? optionalAbilityPrompt : Localizer.getInstance().getMessage("lblWouldYouLikeProceedWithOptionalAbility") + " " + sa.getHostCard() + "?\n\n(" + sa.getDescription() + ")"; String prompt = !optionalAbilityPrompt.isEmpty() ? optionalAbilityPrompt : Localizer.getInstance().getMessage("lblWouldYouLikeProceedWithOptionalAbility") + " " + sa.getHostCard() + "?\n\n(" + sa.getDescription() + ")";
if (!p.getController().confirmAction(sa, null, TextUtil.fastReplace(prompt, "CARDNAME", sa.getHostCard().getName()))) { if (!p.getController().confirmAction(sa, null, TextUtil.fastReplace(prompt, "CARDNAME", CardTranslation.getTranslatedName(sa.getHostCard().getName())))) {
return; return;
} }
} }

3
forge-gui-desktop/src/main/java/forge/gui/CardListViewer.java
View File

@@ -24,6 +24,7 @@ import java.awt.event.WindowEvent;
import java.awt.event.WindowFocusListener; import java.awt.event.WindowFocusListener;
import java.util.Collections; import java.util.Collections;
import java.util.List; import java.util.List;
import forge.util.Localizer;
import javax.swing.AbstractListModel; import javax.swing.AbstractListModel;
import javax.swing.Icon; import javax.swing.Icon;
@@ -113,7 +114,7 @@ public class CardListViewer extends FDialog {
this.addWindowFocusListener(new CardListFocuser()); this.addWindowFocusListener(new CardListFocuser());
final FButton btnOK = new FButton("OK"); final FButton btnOK = new FButton(Localizer.getInstance().getMessage("lblOK"));
btnOK.addActionListener(new ActionListener() { btnOK.addActionListener(new ActionListener() {
@Override @Override
public void actionPerformed(final ActionEvent e) { public void actionPerformed(final ActionEvent e) {

8
forge-gui-desktop/src/main/java/forge/gui/ListChooser.java
View File

@@ -46,6 +46,8 @@ import forge.toolbox.FMouseAdapter;
import forge.toolbox.FOptionPane; import forge.toolbox.FOptionPane;
import forge.toolbox.FScrollPane; import forge.toolbox.FScrollPane;
import forge.util.Localizer;
/** /**
* A simple class that shows a list of choices in a dialog. Two properties * A simple class that shows a list of choices in a dialog. Two properties
* influence the behavior of a list chooser: minSelection and maxSelection. * influence the behavior of a list chooser: minSelection and maxSelection.
@@ -60,7 +62,7 @@ import forge.toolbox.FScrollPane;
* disabled.</li> * disabled.</li>
* <li>The dialog was "committed" if "OK" was clicked or a choice was double * <li>The dialog was "committed" if "OK" was clicked or a choice was double
* clicked.</li> * clicked.</li>
* <li>The dialog was "canceled" if "Cancel" or "X" was clicked.</li> * <li>The dialog was "canceled" if Localizer.getInstance().getMessage("lblCancel") or "X" was clicked.</li>
* <li>If the dialog was canceled, the selection will be empty.</li> * <li>If the dialog was canceled, the selection will be empty.</li>
* <li> * <li>
* </ul> * </ul>
@@ -91,9 +93,9 @@ public class ListChooser<T> {
final ImmutableList<String> options; final ImmutableList<String> options;
if (minChoices == 0) { if (minChoices == 0) {
options = ImmutableList.of("OK","Cancel"); options = ImmutableList.of(Localizer.getInstance().getMessage("lblOK"),Localizer.getInstance().getMessage("lblCancel"));
} else { } else {
options = ImmutableList.of("OK"); options = ImmutableList.of(Localizer.getInstance().getMessage("lblOK"));
} }
if (maxChoices == 1 || minChoices == -1) { if (maxChoices == 1 || minChoices == -1) {

7
forge-gui-desktop/src/main/java/forge/itemmanager/filters/AdvancedSearchFilter.java
View File

@@ -21,6 +21,7 @@ import forge.toolbox.FSkin;
import forge.toolbox.FSkin.SkinnedPanel; import forge.toolbox.FSkin.SkinnedPanel;
import forge.toolbox.FTextField; import forge.toolbox.FTextField;
import forge.toolbox.LayoutHelper; import forge.toolbox.LayoutHelper;
import forge.util.Localizer;
import javax.swing.*; import javax.swing.*;
@@ -89,7 +90,7 @@ public class AdvancedSearchFilter<T extends InventoryItem> extends ItemFilter<T>
GuiUtils.addSeparator(menu); GuiUtils.addSeparator(menu);
} }
GuiUtils.addMenuItem(menu, "Edit Expression", null, new Runnable() { GuiUtils.addMenuItem(menu, Localizer.getInstance().getMessage("lblEditExpression"), null, new Runnable() {
@Override @Override
public void run() { public void run() {
edit(); edit();
@@ -97,7 +98,7 @@ public class AdvancedSearchFilter<T extends InventoryItem> extends ItemFilter<T>
}); });
if (hasFilters) { if (hasFilters) {
GuiUtils.addMenuItem(menu, "Clear Filter", null, new Runnable() { GuiUtils.addMenuItem(menu, Localizer.getInstance().getMessage("lblClearFilter"), null, new Runnable() {
@Override @Override
public void run() { public void run() {
reset(); reset();
@@ -173,7 +174,7 @@ public class AdvancedSearchFilter<T extends InventoryItem> extends ItemFilter<T>
} }
private boolean show() { private boolean show() {
optionPane = new FOptionPane(null, "Advanced Search", null, scroller, ImmutableList.of("OK", "Cancel"), 0); optionPane = new FOptionPane(null, Localizer.getInstance().getMessage("lblAdvancedSearch"), null, scroller, ImmutableList.of(Localizer.getInstance().getMessage("lblOK"), Localizer.getInstance().getMessage("lblCancel")), 0);
optionPane.addComponentListener(new ComponentAdapter() { optionPane.addComponentListener(new ComponentAdapter() {
@Override @Override
public void componentShown(ComponentEvent e) { public void componentShown(ComponentEvent e) {

39
forge-gui-desktop/src/main/java/forge/screens/home/quest/DialogChooseSets.java
View File

@@ -7,6 +7,7 @@ import forge.gui.SOverlayUtils;
import forge.model.FModel; import forge.model.FModel;
import forge.toolbox.*; import forge.toolbox.*;
import forge.util.TextUtil; import forge.util.TextUtil;
import forge.util.Localizer;
import net.miginfocom.swing.MigLayout; import net.miginfocom.swing.MigLayout;
import javax.swing.*; import javax.swing.*;
@@ -24,7 +25,7 @@ public class DialogChooseSets {
private Runnable okCallback; private Runnable okCallback;
private final List<FCheckBox> choices = new ArrayList<>(); private final List<FCheckBox> choices = new ArrayList<>();
private final FCheckBox cbWantReprints = new FCheckBox("Display compatible reprints from more recent sets"); private final FCheckBox cbWantReprints = new FCheckBox(Localizer.getInstance().getMessage("lblDisplayRecentSetRepints"));
// lists are of set codes (e.g. "2ED") // lists are of set codes (e.g. "2ED")
public DialogChooseSets(Collection<String> preselectedSets, Collection<String> unselectableSets, boolean showWantReprintsCheckbox) { public DialogChooseSets(Collection<String> preselectedSets, Collection<String> unselectableSets, boolean showWantReprintsCheckbox) {
@@ -76,21 +77,21 @@ public class DialogChooseSets {
optionsPanel.setVisible(false); optionsPanel.setVisible(false);
optionsPanel.setOpaque(false); optionsPanel.setOpaque(false);
optionsPanel.add(new JSeparator(SwingConstants.HORIZONTAL), "w 100%, span 2, growx"); optionsPanel.add(new JSeparator(SwingConstants.HORIZONTAL), "w 100%, span 2, growx");
optionsPanel.add(new FLabel.Builder().text("Select Random Sets").fontSize(17).fontStyle(Font.BOLD).build(), "h 40!, span 2"); optionsPanel.add(new FLabel.Builder().text(Localizer.getInstance().getMessage("lblSelectRandomSets")).fontSize(17).fontStyle(Font.BOLD).build(), "h 40!, span 2");
JPanel leftOptionsPanel = new JPanel(new MigLayout("insets 10, gap 5, center, wrap 2")); JPanel leftOptionsPanel = new JPanel(new MigLayout("insets 10, gap 5, center, wrap 2"));
leftOptionsPanel.setOpaque(false); leftOptionsPanel.setOpaque(false);
leftOptionsPanel.add(new FLabel.Builder().text("Number to Select:").fontSize(14).fontStyle(Font.BOLD).build(), " span 2"); leftOptionsPanel.add(new FLabel.Builder().text(Localizer.getInstance().getMessage("lblSelectNumber") + ":").fontSize(14).fontStyle(Font.BOLD).build(), " span 2");
leftOptionsPanel.add(new FLabel.Builder().text("Core:").build()); leftOptionsPanel.add(new FLabel.Builder().text(Localizer.getInstance().getMessage("lblCore") + ":").build());
leftOptionsPanel.add(coreField, "w 40!"); leftOptionsPanel.add(coreField, "w 40!");
leftOptionsPanel.add(new FLabel.Builder().text("Expansion:").build()); leftOptionsPanel.add(new FLabel.Builder().text(Localizer.getInstance().getMessage("lblExpansion") + ":").build());
leftOptionsPanel.add(expansionField, "w 40!"); leftOptionsPanel.add(expansionField, "w 40!");
leftOptionsPanel.add(new FLabel.Builder().text("Other:").build()); leftOptionsPanel.add(new FLabel.Builder().text("Other:").build());
leftOptionsPanel.add(otherField, "w 40!"); leftOptionsPanel.add(otherField, "w 40!");
JPanel rightOptionsPanel = new JPanel(new MigLayout("insets 10, gap 25 5, center, wrap 2")); JPanel rightOptionsPanel = new JPanel(new MigLayout("insets 10, gap 25 5, center, wrap 2"));
rightOptionsPanel.setOpaque(false); rightOptionsPanel.setOpaque(false);
rightOptionsPanel.add(new FLabel.Builder().text("Format Restrictions:").fontSize(14).fontStyle(Font.BOLD).build(), "span 2"); rightOptionsPanel.add(new FLabel.Builder().text(Localizer.getInstance().getMessage("lblFormatRestrictions") +":").fontSize(14).fontStyle(Font.BOLD).build(), "span 2");
ButtonGroup formatButtonGroup = new ButtonGroup(); ButtonGroup formatButtonGroup = new ButtonGroup();
List<GameFormat> gameFormats = new ArrayList<>(); List<GameFormat> gameFormats = new ArrayList<>();
@@ -98,7 +99,7 @@ public class DialogChooseSets {
gameFormats.forEach(item -> { gameFormats.forEach(item -> {
if (item.getName().equals("Legacy")) { if (item.getName().equals("Legacy")) {
FRadioButton button = new FRadioButton("Legacy/Vintage"); FRadioButton button = new FRadioButton(Localizer.getInstance().getMessage("lblLegacyOrVintage"));
button.setActionCommand(item.getName()); button.setActionCommand(item.getName());
formatButtonGroup.add(button); formatButtonGroup.add(button);
rightOptionsPanel.add(button); rightOptionsPanel.add(button);
@@ -110,12 +111,12 @@ public class DialogChooseSets {
} }
}); });
FRadioButton button = new FRadioButton("Modern Card Frame"); FRadioButton button = new FRadioButton(Localizer.getInstance().getMessage("lblModernCardFrame"));
button.setActionCommand("Modern Card Frame"); button.setActionCommand("Modern Card Frame");
formatButtonGroup.add(button); formatButtonGroup.add(button);
rightOptionsPanel.add(button); rightOptionsPanel.add(button);
FRadioButton noFormatSelectionButton = new FRadioButton("No Format Restriction"); FRadioButton noFormatSelectionButton = new FRadioButton(Localizer.getInstance().getMessage("lblNoFormatRestriction"));
noFormatSelectionButton.setActionCommand("No Format Restriction"); noFormatSelectionButton.setActionCommand("No Format Restriction");
formatButtonGroup.add(noFormatSelectionButton); formatButtonGroup.add(noFormatSelectionButton);
rightOptionsPanel.add(noFormatSelectionButton); rightOptionsPanel.add(noFormatSelectionButton);
@@ -124,7 +125,7 @@ public class DialogChooseSets {
optionsPanel.add(leftOptionsPanel, "w 33%:40%:78%"); optionsPanel.add(leftOptionsPanel, "w 33%:40%:78%");
optionsPanel.add(rightOptionsPanel, "w 33%:60%:78%"); optionsPanel.add(rightOptionsPanel, "w 33%:60%:78%");
FButton randomSelectionButton = new FButton("Randomize Sets"); FButton randomSelectionButton = new FButton(Localizer.getInstance().getMessage("lblRandomizeSets"));
randomSelectionButton.addActionListener(actionEvent -> { randomSelectionButton.addActionListener(actionEvent -> {
int numberOfCoreSets = Integer.parseInt(coreField.getText()); int numberOfCoreSets = Integer.parseInt(coreField.getText());
@@ -214,7 +215,7 @@ public class DialogChooseSets {
}); });
FButton clearSelectionButton = new FButton("Clear Selection"); FButton clearSelectionButton = new FButton(Localizer.getInstance().getMessage("lblClearSelection"));
clearSelectionButton.addActionListener(actionEvent -> { clearSelectionButton.addActionListener(actionEvent -> {
for (FCheckBox coreSet : coreSets) { for (FCheckBox coreSet : coreSets) {
coreSet.setSelected(false); coreSet.setSelected(false);
@@ -228,13 +229,13 @@ public class DialogChooseSets {
panel.repaintSelf(); panel.repaintSelf();
}); });
FButton showOptionsButton = new FButton("Show Options"); FButton showOptionsButton = new FButton(Localizer.getInstance().getMessage("lblShowOptions"));
showOptionsButton.addActionListener(actionEvent -> { showOptionsButton.addActionListener(actionEvent -> {
optionsPanel.setVisible(true); optionsPanel.setVisible(true);
showOptionsButton.setVisible(false); showOptionsButton.setVisible(false);
}); });
FButton hideOptionsButton = new FButton("Hide Options"); FButton hideOptionsButton = new FButton(Localizer.getInstance().getMessage("lblHideOptions"));
hideOptionsButton.addActionListener(actionEvent -> { hideOptionsButton.addActionListener(actionEvent -> {
optionsPanel.setVisible(false); optionsPanel.setVisible(false);
showOptionsButton.setVisible(true); showOptionsButton.setVisible(true);
@@ -254,12 +255,12 @@ public class DialogChooseSets {
optionsPanel.add(new JSeparator(SwingConstants.HORIZONTAL), "w 100%, span 2, growx"); optionsPanel.add(new JSeparator(SwingConstants.HORIZONTAL), "w 100%, span 2, growx");
panel.add(new FLabel.Builder().text("Choose sets").fontSize(20).build(), "center, span, wrap, gaptop 10"); panel.add(new FLabel.Builder().text(Localizer.getInstance().getMessage("lblChooseSets")).fontSize(20).build(), "center, span, wrap, gaptop 10");
String constraints = "aligny top"; String constraints = "aligny top";
panel.add(makeCheckBoxList(coreSets, "Core sets", true), constraints); panel.add(makeCheckBoxList(coreSets, Localizer.getInstance().getMessage("lblCoreSets"), true), constraints);
panel.add(makeCheckBoxList(expansionSets, "Expansions", false), constraints); panel.add(makeCheckBoxList(expansionSets, Localizer.getInstance().getMessage("lblExpansions"), false), constraints);
panel.add(makeCheckBoxList(otherSets, "Other sets", false), constraints); panel.add(makeCheckBoxList(otherSets, Localizer.getInstance().getMessage("lblOtherSets"), false), constraints);
panel.add(showOptionsButton, "center, w 230!, h 30!, gap 10 0 20 0, span 3, hidemode 3"); panel.add(showOptionsButton, "center, w 230!, h 30!, gap 10 0 20 0, span 3, hidemode 3");
panel.add(optionsPanel, "center, w 100, span 3, growx, hidemode 3"); panel.add(optionsPanel, "center, w 100, span 3, growx, hidemode 3");
@@ -273,7 +274,7 @@ public class DialogChooseSets {
} }
}; };
FButton btnOk = new FButton("OK"); FButton btnOk = new FButton(Localizer.getInstance().getMessage("lblOK"));
btnOk.addActionListener(new ActionListener() { btnOk.addActionListener(new ActionListener() {
@Override @Override
public void actionPerformed(ActionEvent arg0) { public void actionPerformed(ActionEvent arg0) {
@@ -282,7 +283,7 @@ public class DialogChooseSets {
} }
}); });
FButton btnCancel = new FButton("Cancel"); FButton btnCancel = new FButton(Localizer.getInstance().getMessage("lblCancel"));
btnCancel.addActionListener(new ActionListener() { btnCancel.addActionListener(new ActionListener() {
@Override @Override
public void actionPerformed(ActionEvent e) { public void actionPerformed(ActionEvent e) {

14
forge-gui-desktop/src/main/java/forge/screens/home/sanctioned/VSubmenuSealed.java
View File

@@ -77,7 +77,7 @@ public enum VSubmenuSealed implements IVSubmenu<CSubmenuSealed> {
private final FLabel btnDirections = new FLabel.Builder() private final FLabel btnDirections = new FLabel.Builder()
.fontSize(16).opaque(true).hoverable(true) .fontSize(16).opaque(true).hoverable(true)
.text("How To Play").fontAlign(SwingConstants.CENTER).build(); .text(localizer.getMessage("lblHowtoPlay")).fontAlign(SwingConstants.CENTER).build();
/** /**
* Constructor. * Constructor.
@@ -181,15 +181,7 @@ public enum VSubmenuSealed implements IVSubmenu<CSubmenuSealed> {
final JPanel overlay = SOverlayUtils.genericOverlay(); final JPanel overlay = SOverlayUtils.genericOverlay();
final int w = overlay.getWidth(); final int w = overlay.getWidth();
final String instructions = "SEALED DECK MODE INSTRUCTIONS" final String instructions = localizer.getMessage("lblSealedModeInstruction");
+ "\r\n\r\n"
+ "In Sealed Deck tournaments, each player receives six booster packs"
+ "from which to build their deck."
+ "\r\n\r\n"
+ "Depending on which sets are to be used in a sealed deck event, "
+ "the distribution of packs can vary greatly."
+ "\r\n\r\n"
+ "Credit: Wikipedia";
// Init directions text pane // Init directions text pane
final SkinnedTextPane tpnDirections = new SkinnedTextPane(); final SkinnedTextPane tpnDirections = new SkinnedTextPane();
@@ -207,7 +199,7 @@ public enum VSubmenuSealed implements IVSubmenu<CSubmenuSealed> {
StyleConstants.setAlignment(center, StyleConstants.ALIGN_CENTER); StyleConstants.setAlignment(center, StyleConstants.ALIGN_CENTER);
doc.setParagraphAttributes(0, doc.getLength(), center, false); doc.setParagraphAttributes(0, doc.getLength(), center, false);
final JButton btnCloseBig = new FButton("OK"); final JButton btnCloseBig = new FButton(localizer.getMessage("lblOK"));
btnCloseBig.setBounds(new Rectangle((w / 2 - 100), 510, 200, 30)); btnCloseBig.setBounds(new Rectangle((w / 2 - 100), 510, 200, 30));
btnCloseBig.addActionListener(new ActionListener() { @Override btnCloseBig.addActionListener(new ActionListener() { @Override
public void actionPerformed(final ActionEvent arg0) { SOverlayUtils.hideOverlay(); } }); public void actionPerformed(final ActionEvent arg0) { SOverlayUtils.hideOverlay(); } });

2
forge-gui-desktop/src/main/java/forge/screens/home/settings/VSubmenuDownloaders.java
View File

@@ -186,7 +186,7 @@ public enum VSubmenuDownloaders implements IVSubmenu<CSubmenuDownloaders> {
p.setOpaque(false); p.setOpaque(false);
p.setBackgroundTexture(FSkin.getIcon(FSkinProp.BG_TEXTURE)); p.setBackgroundTexture(FSkin.getIcon(FSkinProp.BG_TEXTURE));
final FButton btnClose = new FButton("OK"); final FButton btnClose = new FButton(localizer.getMessage("lblOK"));
btnClose.addActionListener(new ActionListener() { @Override btnClose.addActionListener(new ActionListener() { @Override
public void actionPerformed(final ActionEvent arg0) { SOverlayUtils.hideOverlay(); } }); public void actionPerformed(final ActionEvent arg0) { SOverlayUtils.hideOverlay(); } });

151
forge-gui-desktop/src/main/java/forge/screens/match/CMatchUI.java
View File

@@ -126,6 +126,7 @@ import forge.util.ITriggerEvent;
import forge.util.collect.FCollection; import forge.util.collect.FCollection;
import forge.util.collect.FCollectionView; import forge.util.collect.FCollectionView;
import forge.util.gui.SOptionPane; import forge.util.gui.SOptionPane;
import forge.util.Localizer;
import forge.view.FView; import forge.view.FView;
import forge.view.arcane.CardPanel; import forge.view.arcane.CardPanel;
import forge.view.arcane.FloatingZone; import forge.view.arcane.FloatingZone;
@@ -460,53 +461,53 @@ public final class CMatchUI
public Iterable<PlayerZoneUpdate> tempShowZones(final PlayerView controller, final Iterable<PlayerZoneUpdate> zonesToUpdate) { public Iterable<PlayerZoneUpdate> tempShowZones(final PlayerView controller, final Iterable<PlayerZoneUpdate> zonesToUpdate) {
for (final PlayerZoneUpdate update : zonesToUpdate) { for (final PlayerZoneUpdate update : zonesToUpdate) {
final PlayerView player = update.getPlayer(); final PlayerView player = update.getPlayer();
for (final ZoneType zone : update.getZones()) { for (final ZoneType zone : update.getZones()) {
switch (zone) { switch (zone) {
case Battlefield: // always shown case Battlefield: // always shown
break; break;
case Hand: // controller hand always shown case Hand: // controller hand always shown
if (controller != player) { if (controller != player) {
FloatingZone.show(this,player,zone); FloatingZone.show(this,player,zone);
} }
break; break;
case Library: case Library:
case Graveyard: case Graveyard:
case Exile: case Exile:
case Flashback: case Flashback:
case Command: case Command:
FloatingZone.show(this,player,zone); FloatingZone.show(this,player,zone);
break; break;
default: default:
break; break;
} }
} }
} }
return zonesToUpdate; //pfps should return only the newly shown zones return zonesToUpdate; //pfps should return only the newly shown zones
} }
@Override @Override
public void hideZones(final PlayerView controller, final Iterable<PlayerZoneUpdate> zonesToUpdate) { public void hideZones(final PlayerView controller, final Iterable<PlayerZoneUpdate> zonesToUpdate) {
if ( zonesToUpdate != null ) { if ( zonesToUpdate != null ) {
for (final PlayerZoneUpdate update : zonesToUpdate) { for (final PlayerZoneUpdate update : zonesToUpdate) {
final PlayerView player = update.getPlayer(); final PlayerView player = update.getPlayer();
for (final ZoneType zone : update.getZones()) { for (final ZoneType zone : update.getZones()) {
switch (zone) { switch (zone) {
case Battlefield: // always shown case Battlefield: // always shown
break; break;
case Hand: // the controller's hand should never be temporarily shown, but ... case Hand: // the controller's hand should never be temporarily shown, but ...
case Library: case Library:
case Graveyard: case Graveyard:
case Exile: case Exile:
case Flashback: case Flashback:
case Command: case Command:
FloatingZone.hide(this,player,zone); FloatingZone.hide(this,player,zone);
break; break;
default: default:
break; break;
} }
} }
} }
} }
} }
// Player's mana pool changes // Player's mana pool changes
@@ -550,7 +551,7 @@ public final class CMatchUI
} }
break; break;
default: default:
FloatingZone.refresh(c.getController(),zone); // in case the card is visible in the zone FloatingZone.refresh(c.getController(),zone); // in case the card is visible in the zone
break; break;
} }
} }
@@ -561,18 +562,18 @@ public final class CMatchUI
super.setSelectables(cards); super.setSelectables(cards);
// update zones on tabletop and floating zones - non-selectable cards may be rendered differently // update zones on tabletop and floating zones - non-selectable cards may be rendered differently
FThreads.invokeInEdtNowOrLater(new Runnable() { FThreads.invokeInEdtNowOrLater(new Runnable() {
@Override public final void run() { @Override public final void run() {
for (final PlayerView p : getGameView().getPlayers()) { for (final PlayerView p : getGameView().getPlayers()) {
if ( p.getCards(ZoneType.Battlefield) != null ) { if ( p.getCards(ZoneType.Battlefield) != null ) {
updateCards(p.getCards(ZoneType.Battlefield)); updateCards(p.getCards(ZoneType.Battlefield));
} }
if ( p.getCards(ZoneType.Hand) != null ) { if ( p.getCards(ZoneType.Hand) != null ) {
updateCards(p.getCards(ZoneType.Hand)); updateCards(p.getCards(ZoneType.Hand));
} }
} }
FloatingZone.refreshAll(); FloatingZone.refreshAll();
} }
}); });
} }
@Override @Override
@@ -580,18 +581,18 @@ public final class CMatchUI
super.clearSelectables(); super.clearSelectables();
// update zones on tabletop and floating zones - non-selectable cards may be rendered differently // update zones on tabletop and floating zones - non-selectable cards may be rendered differently
FThreads.invokeInEdtNowOrLater(new Runnable() { FThreads.invokeInEdtNowOrLater(new Runnable() {
@Override public final void run() { @Override public final void run() {
for (final PlayerView p : getGameView().getPlayers()) { for (final PlayerView p : getGameView().getPlayers()) {
if ( p.getCards(ZoneType.Battlefield) != null ) { if ( p.getCards(ZoneType.Battlefield) != null ) {
updateCards(p.getCards(ZoneType.Battlefield)); updateCards(p.getCards(ZoneType.Battlefield));
} }
if ( p.getCards(ZoneType.Hand) != null ) { if ( p.getCards(ZoneType.Hand) != null ) {
updateCards(p.getCards(ZoneType.Hand)); updateCards(p.getCards(ZoneType.Hand));
} }
} }
FloatingZone.refreshAll(); FloatingZone.refreshAll();
} }
}); });
} }
@@ -857,7 +858,7 @@ public final class CMatchUI
if (abilities.size() == 1) { if (abilities.size() == 1) {
return abilities.get(0); return abilities.get(0);
} }
return GuiChoose.oneOrNone("Choose ability to play", abilities); return GuiChoose.oneOrNone(Localizer.getInstance().getMessage("lblChooseAbilityToPlay"), abilities);
} }
if (abilities.isEmpty()) { if (abilities.isEmpty()) {
@@ -871,7 +872,7 @@ public final class CMatchUI
} }
//show menu if mouse was trigger for ability //show menu if mouse was trigger for ability
final JPopupMenu menu = new JPopupMenu("Abilities"); final JPopupMenu menu = new JPopupMenu(Localizer.getInstance().getMessage("lblAbilities"));
boolean enabled; boolean enabled;
int firstEnabled = -1; int firstEnabled = -1;
@@ -1071,7 +1072,7 @@ public final class CMatchUI
if (delayedReveal != null) { if (delayedReveal != null) {
reveal(delayedReveal.getMessagePrefix(), delayedReveal.getCards()); //TODO: Merge this into search dialog reveal(delayedReveal.getMessagePrefix(), delayedReveal.getCards()); //TODO: Merge this into search dialog
} }
return (List<GameEntityView>) order(title,"Selected", optionList.size() - max, optionList.size() - min, optionList, null, null, false); return (List<GameEntityView>) order(title,Localizer.getInstance().getMessage("lblSelected"), optionList.size() - max, optionList.size() - min, optionList, null, null, false);
} }
@Override @Override
@@ -1228,7 +1229,7 @@ public final class CMatchUI
Dimension maxSize = new Dimension(1400, parentSize.height - 100); Dimension maxSize = new Dimension(1400, parentSize.height - 100);
mainPanel.setMaximumSize(maxSize); mainPanel.setMaximumSize(maxSize);
mainPanel.setOpaque(false); mainPanel.setOpaque(false);
// Big Image // Big Image
addBigImageToStackModalPanel(mainPanel, si); addBigImageToStackModalPanel(mainPanel, si);
@@ -1256,7 +1257,7 @@ public final class CMatchUI
numSmallImages++; numSmallImages++;
} }
} }
} }
// If current effect is a triggered ability, I want to show the triggering card if present // If current effect is a triggered ability, I want to show the triggering card if present
SpellAbility sourceSA = (SpellAbility) si.getTriggeringObject(AbilityKey.SourceSA); SpellAbility sourceSA = (SpellAbility) si.getTriggeringObject(AbilityKey.SourceSA);
@@ -1265,7 +1266,7 @@ public final class CMatchUI
sourceCardView = sourceSA.getHostCard().getView(); sourceCardView = sourceSA.getHostCard().getView();
numSmallImages++; numSmallImages++;
} }
// I also want to show each type of targets (both cards and players) // I also want to show each type of targets (both cards and players)
List<GameEntityView> targets = getTargets(si,new ArrayList<GameEntityView>()); List<GameEntityView> targets = getTargets(si,new ArrayList<GameEntityView>());
numSmallImages = numSmallImages + targets.size(); numSmallImages = numSmallImages + targets.size();
@@ -1281,7 +1282,7 @@ public final class CMatchUI
addSmallImageToStackModalPanel(gev, mainPanel, numSmallImages); addSmallImageToStackModalPanel(gev, mainPanel, numSmallImages);
} }
FOptionPane.showOptionDialog(null, "Forge", null, mainPanel, ImmutableList.of("OK")); FOptionPane.showOptionDialog(null, "Forge", null, mainPanel, ImmutableList.of(Localizer.getInstance().getMessage("lblOK")));
// here the user closed the modal - time to update the next notifiable stack index // here the user closed the modal - time to update the next notifiable stack index
} }

11
forge-gui-desktop/src/main/java/forge/screens/match/VAutoYields.java
View File

@@ -16,6 +16,7 @@ import forge.toolbox.FList;
import forge.toolbox.FOptionPane; import forge.toolbox.FOptionPane;
import forge.toolbox.FScrollPane; import forge.toolbox.FScrollPane;
import forge.view.FDialog; import forge.view.FDialog;
import forge.util.Localizer;
@SuppressWarnings("serial") @SuppressWarnings("serial")
public class VAutoYields extends FDialog { public class VAutoYields extends FDialog {
@@ -32,7 +33,7 @@ public class VAutoYields extends FDialog {
public VAutoYields(final CMatchUI matchUI) { public VAutoYields(final CMatchUI matchUI) {
super(); super();
setTitle("Auto-Yields"); setTitle(Localizer.getInstance().getMessage("lblAutoYields"));
autoYields = new ArrayList<>(); autoYields = new ArrayList<>();
for (final String autoYield : matchUI.getAutoYields()) { for (final String autoYield : matchUI.getAutoYields()) {
@@ -47,7 +48,7 @@ public class VAutoYields extends FDialog {
listScroller = new FScrollPane(lstAutoYields, true); listScroller = new FScrollPane(lstAutoYields, true);
chkDisableAll = new FCheckBox("Disable All Auto Yields", matchUI.getDisableAutoYields()); chkDisableAll = new FCheckBox(Localizer.getInstance().getMessage("lblDisableAllAutoYields"), matchUI.getDisableAutoYields());
chkDisableAll.addChangeListener(new ChangeListener() { chkDisableAll.addChangeListener(new ChangeListener() {
@Override @Override
public void stateChanged(ChangeEvent e) { public void stateChanged(ChangeEvent e) {
@@ -55,14 +56,14 @@ public class VAutoYields extends FDialog {
} }
}); });
btnOk = new FButton("OK"); btnOk = new FButton(Localizer.getInstance().getMessage("lblOK"));
btnOk.setCommand(new UiCommand() { btnOk.setCommand(new UiCommand() {
@Override @Override
public void run() { public void run() {
setVisible(false); setVisible(false);
} }
}); });
btnRemove = new FButton("Remove Yield"); btnRemove = new FButton(Localizer.getInstance().getMessage("lblRemoveYield"));
btnRemove.setCommand(new UiCommand() { btnRemove.setCommand(new UiCommand() {
@Override @Override
public void run() { public void run() {
@@ -115,7 +116,7 @@ public class VAutoYields extends FDialog {
setVisible(true); setVisible(true);
dispose(); dispose();
} else { } else {
FOptionPane.showMessageDialog("There are no active auto-yields.", "No Auto-Yields", FOptionPane.INFORMATION_ICON); FOptionPane.showMessageDialog(Localizer.getInstance().getMessage("lblNoActiveAutoYield"), Localizer.getInstance().getMessage("lblNoAutoYield"), FOptionPane.INFORMATION_ICON);
} }
} }
} }

9
forge-gui-desktop/src/main/java/forge/toolbox/FOptionPane.java
View File

@@ -20,6 +20,7 @@ import com.google.common.collect.ImmutableList;
import forge.assets.FSkinProp; import forge.assets.FSkinProp;
import forge.toolbox.FSkin.SkinImage; import forge.toolbox.FSkin.SkinImage;
import forge.view.FDialog; import forge.view.FDialog;
import forge.util.Localizer;
/** /**
* Class to replace JOptionPane using skinned dialogs * Class to replace JOptionPane using skinned dialogs
@@ -49,7 +50,7 @@ public class FOptionPane extends FDialog {
} }
public static void showMessageDialog(final String message, final String title, final SkinImage icon) { public static void showMessageDialog(final String message, final String title, final SkinImage icon) {
showOptionDialog(message, title, icon, ImmutableList.of("OK"), 0); showOptionDialog(message, title, icon, ImmutableList.of(Localizer.getInstance().getMessage("lblOK")), 0);
} }
public static boolean showConfirmDialog(final String message) { public static boolean showConfirmDialog(final String message) {
@@ -57,11 +58,11 @@ public class FOptionPane extends FDialog {
} }
public static boolean showConfirmDialog(final String message, final String title) { public static boolean showConfirmDialog(final String message, final String title) {
return showConfirmDialog(message, title, "Yes", "No", true); return showConfirmDialog(message, title, Localizer.getInstance().getMessage("lblYes"), Localizer.getInstance().getMessage("lblNo"), true);
} }
public static boolean showConfirmDialog(final String message, final String title, final boolean defaultYes) { public static boolean showConfirmDialog(final String message, final String title, final boolean defaultYes) {
return showConfirmDialog(message, title, "Yes", "No", defaultYes); return showConfirmDialog(message, title, Localizer.getInstance().getMessage("lblYes"), Localizer.getInstance().getMessage("lblNo"), defaultYes);
} }
public static boolean showConfirmDialog(final String message, final String title, final String yesButtonText, final String noButtonText) { public static boolean showConfirmDialog(final String message, final String title, final String yesButtonText, final String noButtonText) {
@@ -124,7 +125,7 @@ public class FOptionPane extends FDialog {
inputField = cbInput; inputField = cbInput;
} }
final FOptionPane optionPane = new FOptionPane(message, title, icon, inputField, ImmutableList.of("OK", "Cancel"), -1); final FOptionPane optionPane = new FOptionPane(message, title, icon, inputField, ImmutableList.of(Localizer.getInstance().getMessage("lblOK"), Localizer.getInstance().getMessage("lblCancel")), -1);
optionPane.setDefaultFocus(inputField); optionPane.setDefaultFocus(inputField);
inputField.addKeyListener(new KeyAdapter() { //hook so pressing Enter on field accepts dialog inputField.addKeyListener(new KeyAdapter() { //hook so pressing Enter on field accepts dialog
@Override @Override

4
forge-gui-mobile/src/forge/card/GameEntityPicker.java
View File

@@ -27,14 +27,14 @@ public class GameEntityPicker extends TabPageScreen<GameEntityPicker> {
public GameEntityPicker(String title, Collection<? extends GameEntityView> choiceList, Collection<CardView> revealList, String revealListCaption, FImage revealListImage, boolean isOptional, final Callback<GameEntityView> callback) { public GameEntityPicker(String title, Collection<? extends GameEntityView> choiceList, Collection<CardView> revealList, String revealListCaption, FImage revealListImage, boolean isOptional, final Callback<GameEntityView> callback) {
super(new PickerTab[] { super(new PickerTab[] {
new PickerTab(choiceList, "Choices", FSkinImage.DECKLIST, 1), new PickerTab(choiceList, Localizer.getInstance().getMessage("Choices"), FSkinImage.DECKLIST, 1),
new PickerTab(revealList, revealListCaption, revealListImage, 0) new PickerTab(revealList, revealListCaption, revealListImage, 0)
}, false); }, false);
setHeight(FOptionPane.getMaxDisplayObjHeight()); setHeight(FOptionPane.getMaxDisplayObjHeight());
optionPane = new FOptionPane(null, null, title, null, this, optionPane = new FOptionPane(null, null, title, null, this,
isOptional ? ImmutableList.of("OK", "Cancel") : ImmutableList.of("OK"), 0, new Callback<Integer>() { isOptional ? ImmutableList.of(Localizer.getInstance().getMessage("lblOK"), Localizer.getInstance().getMessage("lblCancel")) : ImmutableList.of(Localizer.getInstance().getMessage("lblOK")), 0, new Callback<Integer>() {
@Override @Override
public void run(Integer result) { public void run(Integer result) {
if (result == 0) { if (result == 0) {

11
forge-gui-mobile/src/forge/screens/match/views/VAutoYields.java
View File

@@ -11,13 +11,14 @@ import forge.toolbox.FEvent;
import forge.toolbox.FEvent.FEventHandler; import forge.toolbox.FEvent.FEventHandler;
import forge.toolbox.FOptionPane; import forge.toolbox.FOptionPane;
import forge.util.TextBounds; import forge.util.TextBounds;
import forge.util.Localizer;
public class VAutoYields extends FDialog { public class VAutoYields extends FDialog {
private final FChoiceList<String> lstAutoYields; private final FChoiceList<String> lstAutoYields;
private final FCheckBox chkDisableAll; private final FCheckBox chkDisableAll;
public VAutoYields() { public VAutoYields() {
super("Auto-Yields", 2); super(Localizer.getInstance().getMessage("lblAutoYields"), 2);
List<String> autoYields = new ArrayList<>(); List<String> autoYields = new ArrayList<>();
for (String autoYield : MatchController.instance.getAutoYields()) { for (String autoYield : MatchController.instance.getAutoYields()) {
autoYields.add(autoYield); autoYields.add(autoYield);
@@ -33,20 +34,20 @@ public class VAutoYields extends FDialog {
return true; return true;
} }
}); });
chkDisableAll = add(new FCheckBox("Disable All Auto Yields", MatchController.instance.getDisableAutoYields())); chkDisableAll = add(new FCheckBox(Localizer.getInstance().getMessage("lblDisableAllAutoYields"), MatchController.instance.getDisableAutoYields()));
chkDisableAll.setCommand(new FEventHandler() { chkDisableAll.setCommand(new FEventHandler() {
@Override @Override
public void handleEvent(FEvent e) { public void handleEvent(FEvent e) {
MatchController.instance.setDisableAutoYields(chkDisableAll.isSelected()); MatchController.instance.setDisableAutoYields(chkDisableAll.isSelected());
} }
}); });
initButton(0, "OK", new FEventHandler() { initButton(0, Localizer.getInstance().getMessage("lblOK"), new FEventHandler() {
@Override @Override
public void handleEvent(FEvent e) { public void handleEvent(FEvent e) {
hide(); hide();
} }
}); });
initButton(1, "Remove Yield", new FEventHandler() { initButton(1, Localizer.getInstance().getMessage("lblRemoveYield"), new FEventHandler() {
@Override @Override
public void handleEvent(FEvent e) { public void handleEvent(FEvent e) {
String selected = lstAutoYields.getSelectedItem(); String selected = lstAutoYields.getSelectedItem();
@@ -68,7 +69,7 @@ public class VAutoYields extends FDialog {
super.show(); super.show();
} }
else { else {
FOptionPane.showMessageDialog("There are no active auto-yields.", "No Auto-Yields", FOptionPane.INFORMATION_ICON); FOptionPane.showMessageDialog(Localizer.getInstance().getMessage("lblNoActiveAutoYield"), Localizer.getInstance().getMessage("lblNoAutoYield"), FOptionPane.INFORMATION_ICON);
} }
} }

5
forge-gui-mobile/src/forge/screens/planarconquest/ConquestRewardDialog.java
View File

@@ -24,6 +24,7 @@ import forge.toolbox.FEvent.FEventHandler;
import forge.toolbox.FLabel; import forge.toolbox.FLabel;
import forge.toolbox.FScrollPane; import forge.toolbox.FScrollPane;
import forge.util.Utils; import forge.util.Utils;
import forge.util.Localizer;
public class ConquestRewardDialog extends FScrollPane { public class ConquestRewardDialog extends FScrollPane {
private static final float PADDING = Utils.scale(5); private static final float PADDING = Utils.scale(5);
@@ -177,7 +178,7 @@ public class ConquestRewardDialog extends FScrollPane {
add(ConquestRewardDialog.this); add(ConquestRewardDialog.this);
initButton(0, "OK", new FEventHandler() { initButton(0, Localizer.getInstance().getMessage("lblOK"), new FEventHandler() {
@Override @Override
public void handleEvent(FEvent e) { public void handleEvent(FEvent e) {
hide(); hide();
@@ -186,7 +187,7 @@ public class ConquestRewardDialog extends FScrollPane {
} }
} }
}); });
initButton(1, "Skip", new FEventHandler() { initButton(1, Localizer.getInstance().getMessage("lblSkip"), new FEventHandler() {
@Override @Override
public void handleEvent(FEvent e) { public void handleEvent(FEvent e) {
animation.skip(); animation.skip();

2
forge-gui-mobile/src/forge/toolbox/FOptionPane.java
View File

@@ -191,7 +191,7 @@ public class FOptionPane extends FDialog {
container.add(inputField); container.add(inputField);
container.setHeight(inputField.getHeight() + padTop + PADDING); container.setHeight(inputField.getHeight() + padTop + PADDING);
final FOptionPane optionPane = new FOptionPane(message, null, title, null, container, ImmutableList.of("OK", "Cancel"), 0, new Callback<Integer>() { final FOptionPane optionPane = new FOptionPane(message, null, title, null, container, ImmutableList.of(Localizer.getInstance().getMessage("lblOK"), Localizer.getInstance().getMessage("lblCancel")), 0, new Callback<Integer>() {
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
@Override @Override
public void run(final Integer result) { public void run(final Integer result) {

9
forge-gui/src/main/java/forge/planarconquest/ConquestChaosBattle.java
View File

@@ -20,6 +20,7 @@ import forge.quest.QuestEventDuel;
import forge.quest.QuestEventDuelManager; import forge.quest.QuestEventDuelManager;
import forge.quest.QuestWorld; import forge.quest.QuestWorld;
import forge.util.Aggregates; import forge.util.Aggregates;
import forge.util.Localizer;
public class ConquestChaosBattle extends ConquestBattle { public class ConquestChaosBattle extends ConquestBattle {
private final QuestWorld world; private final QuestWorld world;
@@ -122,20 +123,20 @@ public class ConquestChaosBattle extends ConquestBattle {
if (game.isMatchOver()) { if (game.isMatchOver()) {
view.getBtnContinue().setVisible(false); view.getBtnContinue().setVisible(false);
if (game.isMatchWonBy(humanPlayer)) { if (game.isMatchWonBy(humanPlayer)) {
view.getBtnQuit().setText("Great!"); view.getBtnQuit().setText(Localizer.getInstance().getMessage("lblGreat") + "!");
model.getChaosBattleRecord().addWin(); model.getChaosBattleRecord().addWin();
setConquered(true); setConquered(true);
} }
else { else {
view.getBtnQuit().setText("OK"); view.getBtnQuit().setText(Localizer.getInstance().getMessage("lblOK"));
model.getChaosBattleRecord().addLoss(); model.getChaosBattleRecord().addLoss();
} }
model.saveData(); model.saveData();
} }
else { else {
view.getBtnContinue().setVisible(true); view.getBtnContinue().setVisible(true);
view.getBtnContinue().setText("Continue"); view.getBtnContinue().setText(Localizer.getInstance().getMessage("btnContinue"));
view.getBtnQuit().setText("Quit"); view.getBtnQuit().setText(Localizer.getInstance().getMessage("btnQuit"));
} }
} }

46
forge-gui/src/main/java/forge/planarconquest/ConquestData.java
View File

@@ -33,6 +33,8 @@ import forge.util.FileUtil;
import forge.util.XmlReader; import forge.util.XmlReader;
import forge.util.XmlWriter; import forge.util.XmlWriter;
import forge.util.gui.SOptionPane; import forge.util.gui.SOptionPane;
import forge.util.Localizer;
import forge.util.CardTranslation;
import java.io.File; import java.io.File;
import java.util.*; import java.util.*;
@@ -265,15 +267,15 @@ public final class ConquestData {
int count = cards.size(); int count = cards.size();
if (count == 0) { return false; } if (count == 0) { return false; }
String title = count == 1 ? "Exile Card" : "Exile " + count + " Cards"; String title = count == 1 ? Localizer.getInstance().getMessage("lblExileCard") : Localizer.getInstance().getMessage("lblExileNCard", String.valueOf(count));
String cardStr = (count == 1 ? "card" : "cards"); String cardStr = (count == 1 ? Localizer.getInstance().getMessage("lblCard") : Localizer.getInstance().getMessage("lblCards"));
List<ConquestCommander> commandersBeingExiled = null; List<ConquestCommander> commandersBeingExiled = null;
StringBuilder message = new StringBuilder("Exile the following " + cardStr + " to receive {AE}" + value + "?\n"); StringBuilder message = new StringBuilder(Localizer.getInstance().getMessage("lblExileFollowCardsToReceiveNAE", cardStr, "{AE}", String.valueOf(value)));
for (PaperCard card : cards) { for (PaperCard card : cards) {
if (planeswalker == card) { if (planeswalker == card) {
SOptionPane.showMessageDialog("Current planeswalker cannot be exiled.", title, SOptionPane.INFORMATION_ICON); SOptionPane.showMessageDialog(Localizer.getInstance().getMessage("lblCurrentPlaneswalkerCannotBeExiled"), title, SOptionPane.INFORMATION_ICON);
return false; return false;
} }
@@ -281,7 +283,7 @@ public final class ConquestData {
for (ConquestCommander commander : commanders) { for (ConquestCommander commander : commanders) {
if (commander.getCard() == card) { if (commander.getCard() == card) {
if (!commander.getDeck().getMain().isEmpty()) { if (!commander.getDeck().getMain().isEmpty()) {
SOptionPane.showMessageDialog("Cannot exile a commander with a defined deck.", title, SOptionPane.INFORMATION_ICON); SOptionPane.showMessageDialog(Localizer.getInstance().getMessage("lblCannotCommanderWithDefinedDeck"), title, SOptionPane.INFORMATION_ICON);
return false; return false;
} }
if (commandersBeingExiled == null) { if (commandersBeingExiled == null) {
@@ -290,19 +292,19 @@ public final class ConquestData {
commandersBeingExiled.add(commander); //cache commander to make it easier to remove later commandersBeingExiled.add(commander); //cache commander to make it easier to remove later
} }
if (commander.getDeck().getMain().contains(card)) { if (commander.getDeck().getMain().contains(card)) {
commandersUsingCard.append("\n").append(commander.getName()); commandersUsingCard.append("\n").append(CardTranslation.getTranslatedName(commander.getName()));
} }
} }
if (commandersUsingCard.length() > 0) { if (commandersUsingCard.length() > 0) {
SOptionPane.showMessageDialog(card.getName() + " is in use by the following commanders and cannot be exiled:\n" + commandersUsingCard, title, SOptionPane.INFORMATION_ICON); SOptionPane.showMessageDialog(Localizer.getInstance().getMessage("lblCommandersCardCannotBeExiledByCard", CardTranslation.getTranslatedName(card.getName()), commandersUsingCard), title, SOptionPane.INFORMATION_ICON);
return false; return false;
} }
message.append("\n").append(card.getName()); message.append("\n").append(CardTranslation.getTranslatedName(card.getName()));
} }
if (SOptionPane.showConfirmDialog(message.toString(), title, "OK", "Cancel")) { if (SOptionPane.showConfirmDialog(message.toString(), title, Localizer.getInstance().getMessage("lblOK"), Localizer.getInstance().getMessage("lblCancel"))) {
if (exiledCards.addAll(cards)) { if (exiledCards.addAll(cards)) {
if (commandersBeingExiled != null) { if (commandersBeingExiled != null) {
commanders.removeAll(commandersBeingExiled); commanders.removeAll(commandersBeingExiled);
@@ -319,18 +321,18 @@ public final class ConquestData {
int count = cards.size(); int count = cards.size();
if (count == 0) { return false; } if (count == 0) { return false; }
String title = count == 1 ? "Retrieve Card" : "Retrieve " + count + " Cards"; String title = count == 1 ? Localizer.getInstance().getMessage("lblRetrieveCard") : Localizer.getInstance().getMessage("lblRetrieveNCard", String.valueOf(count));
String cardStr = (count == 1 ? "card" : "cards"); String cardStr = (count == 1 ? Localizer.getInstance().getMessage("lblCard") : Localizer.getInstance().getMessage("lblCards"));
if (aetherShards < cost) { if (aetherShards < cost) {
SOptionPane.showMessageDialog("Not enough shards to retrieve " + cardStr + ".", title, SOptionPane.INFORMATION_ICON); SOptionPane.showMessageDialog(Localizer.getInstance().getMessage("lblNotEnoughShardsToRetrieveCards", cardStr), title, SOptionPane.INFORMATION_ICON);
return false; return false;
} }
StringBuilder message = new StringBuilder("Spend {AE}" + cost + " to retrieve the following " + cardStr + " from exile?\n"); StringBuilder message = new StringBuilder(Localizer.getInstance().getMessage("lblSpendAECostToRetrieveCardsFromExile", "{AE}", String.valueOf(cost), cardStr));
for (PaperCard card : cards) { for (PaperCard card : cards) {
message.append("\n").append(card.getName()); message.append("\n").append(card.getName());
} }
if (SOptionPane.showConfirmDialog(message.toString(), title, "OK", "Cancel")) { if (SOptionPane.showConfirmDialog(message.toString(), title, Localizer.getInstance().getMessage("lblOK"), Localizer.getInstance().getMessage("lblCancel"))) {
if (exiledCards.removeAll(cards)) { if (exiledCards.removeAll(cards)) {
for (PaperCard card : cards) { for (PaperCard card : cards) {
if (card.getRules().canBeCommander()) { //add back commander for card if needed if (card.getRules().canBeCommander()) { //add back commander for card if needed
@@ -492,14 +494,14 @@ public final class ConquestData {
commanderCount = commanders.size(); commanderCount = commanders.size();
} }
view.getLblAEtherShards().setText("Aether Shards: " + aetherShards); view.getLblAEtherShards().setText(Localizer.getInstance().getMessage("lblAetherShards") + ": " + aetherShards);
view.getLblPlaneswalkEmblems().setText("Planeswalk Emblems: " + planeswalkEmblems); view.getLblPlaneswalkEmblems().setText(Localizer.getInstance().getMessage("lblPlaneswalkEmblems") + ": " + planeswalkEmblems);
view.getLblTotalWins().setText("Total Wins: " + wins); view.getLblTotalWins().setText(Localizer.getInstance().getMessage("lblTotalWins") + ": " + wins);
view.getLblTotalLosses().setText("Total Losses: " + losses); view.getLblTotalLosses().setText(Localizer.getInstance().getMessage("lblTotalLosses") + ": " + losses);
view.getLblConqueredEvents().setText("Conquered Events: " + formatRatio(conqueredCount, totalEventCount)); view.getLblConqueredEvents().setText(Localizer.getInstance().getMessage("lblConqueredEvents") + ": " + formatRatio(conqueredCount, totalEventCount));
view.getLblUnlockedCards().setText("Unlocked Cards: " + formatRatio(unlockedCardCount, totalCardCount)); view.getLblUnlockedCards().setText(Localizer.getInstance().getMessage("lblUnlockedCards") + ": " + formatRatio(unlockedCardCount, totalCardCount));
view.getLblCommanders().setText("Commanders: " + formatRatio(commanderCount, totalCommanderCount)); view.getLblCommanders().setText(Localizer.getInstance().getMessage("lblCommanders") + ": " + formatRatio(commanderCount, totalCommanderCount));
view.getLblPlaneswalkers().setText("Planeswalkers: " + formatRatio(planeswalkerCount, totalPlaneswalkerCount)); view.getLblPlaneswalkers().setText(Localizer.getInstance().getMessage("lblPlaneswalkers") + ": " + formatRatio(planeswalkerCount, totalPlaneswalkerCount));
} }
private String formatRatio(int numerator, int denominator) { private String formatRatio(int numerator, int denominator) {

37
forge-gui/src/main/java/forge/quest/QuestWinLoseController.java
View File

@@ -25,6 +25,7 @@ import forge.quest.data.QuestPreferences.DifficultyPrefs;
import forge.quest.data.QuestPreferences.QPref; import forge.quest.data.QuestPreferences.QPref;
import forge.util.MyRandom; import forge.util.MyRandom;
import forge.util.TextUtil; import forge.util.TextUtil;
import forge.util.Localizer;
import forge.util.gui.SGuiChoose; import forge.util.gui.SGuiChoose;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.apache.commons.lang3.tuple.Pair; import org.apache.commons.lang3.tuple.Pair;
@@ -72,15 +73,15 @@ public class QuestWinLoseController {
final boolean matchIsNotOver = !lastGame.isMatchOver(); final boolean matchIsNotOver = !lastGame.isMatchOver();
if (matchIsNotOver) { if (matchIsNotOver) {
view.getBtnQuit().setText("Quit (-15 Credits)"); view.getBtnQuit().setText(Localizer.getInstance().getMessage("lblQuitByPayCredits"));
} }
else { else {
view.getBtnContinue().setVisible(false); view.getBtnContinue().setVisible(false);
if (wonMatch) { if (wonMatch) {
view.getBtnQuit().setText("Great!"); view.getBtnQuit().setText(Localizer.getInstance().getMessage("lblGreat") + "!");
} }
else { else {
view.getBtnQuit().setText("OK"); view.getBtnQuit().setText(Localizer.getInstance().getMessage("lblOK"));
} }
} }
@@ -160,10 +161,10 @@ public class QuestWinLoseController {
private void anteReport(final List<PaperCard> cardsWon, final List<PaperCard> cardsLost) { private void anteReport(final List<PaperCard> cardsWon, final List<PaperCard> cardsLost) {
// Generate Swing components and attach. // Generate Swing components and attach.
if (cardsWon != null && !cardsWon.isEmpty()) { if (cardsWon != null && !cardsWon.isEmpty()) {
view.showCards("Spoils! Cards won from ante", cardsWon); view.showCards(Localizer.getInstance().getMessage("lblSpoilsWonAnteCard"), cardsWon);
} }
if (cardsLost != null && !cardsLost.isEmpty()) { if (cardsLost != null && !cardsLost.isEmpty()) {
view.showCards("Looted! Cards lost to ante", cardsLost); view.showCards(Localizer.getInstance().getMessage("lblLootedLostAnteCard"), cardsLost);
} }
} }
@@ -385,7 +386,7 @@ public class QuestWinLoseController {
sb.append(TextUtil.concatWithSpace(String.valueOf(credTotal), "credits in total.")); sb.append(TextUtil.concatWithSpace(String.valueOf(credTotal), "credits in total."));
qData.getAssets().addCredits(credTotal); qData.getAssets().addCredits(credTotal);
view.showMessage(sb.toString(), "Gameplay Results", FSkinProp.ICO_QUEST_GOLD); view.showMessage(sb.toString(), Localizer.getInstance().getMessage("lblGameplayResults"), FSkinProp.ICO_QUEST_GOLD);
} }
/** /**
@@ -468,12 +469,12 @@ public class QuestWinLoseController {
} }
if (addDraftToken) { if (addDraftToken) {
view.showMessage("For achieving a 25 win streak, you have been awarded a draft token!\nUse these tokens to generate new tournaments.", "Bonus Draft Token Reward", FSkinProp.ICO_QUEST_COIN); view.showMessage(Localizer.getInstance().getMessage("lblAchieving25WinStreakAwarded"), Localizer.getInstance().getMessage("lblBonusDraftTokenReward"), FSkinProp.ICO_QUEST_COIN);
qData.getAchievements().addDraftToken(); qData.getAchievements().addDraftToken();
} }
if (!cardsWon.isEmpty()) { if (!cardsWon.isEmpty()) {
view.showCards("You have achieved a " + (currentStreak == 0 ? "50" : currentStreak) + " win streak and won " + cardsWon.size() + " " + typeWon + " card" + ((cardsWon.size() != 1) ? "s" : "") + "!", cardsWon); view.showCards(Localizer.getInstance().getMessage("lblAchievedNWinStreakWinMCards", (currentStreak == 0 ? "50" : String.valueOf(currentStreak)), String.valueOf(cardsWon.size()), typeWon), cardsWon);
} }
} }
@@ -486,7 +487,7 @@ public class QuestWinLoseController {
*/ */
private void awardJackpot() { private void awardJackpot() {
final List<PaperCard> cardsWon = qData.getCards().addRandomRare(10); final List<PaperCard> cardsWon = qData.getCards().addRandomRare(10);
view.showCards("You just won 10 random rares!", cardsWon); view.showCards(Localizer.getInstance().getMessage("lblJustWonTenRandomRares"), cardsWon);
} }
/** /**
@@ -515,13 +516,13 @@ public class QuestWinLoseController {
Collections.sort(formats); Collections.sort(formats);
final GameFormat selected = SGuiChoose.getChoices("Choose bonus booster format", 1, 1, formats, pref, null).get(0); final GameFormat selected = SGuiChoose.getChoices(Localizer.getInstance().getMessage("lblChooseBonusBoosterFormat"), 1, 1, formats, pref, null).get(0);
FModel.getQuestPreferences().setPref(QPref.BOOSTER_FORMAT, selected.toString()); FModel.getQuestPreferences().setPref(QPref.BOOSTER_FORMAT, selected.toString());
cardsWon = qData.getCards().generateQuestBooster(selected.getFilterPrinted()); cardsWon = qData.getCards().generateQuestBooster(selected.getFilterPrinted());
qData.getCards().addAllCards(cardsWon); qData.getCards().addAllCards(cardsWon);
title = "Bonus booster pack from the \"" + selected.getName() + "\" format!"; title = Localizer.getInstance().getMessage("lblBonusFormatBoosterPack", selected.getName());
} else { } else {
@@ -566,7 +567,7 @@ public class QuestWinLoseController {
maxChoices--; maxChoices--;
} }
final CardEdition chooseEd = SGuiChoose.one("Choose bonus booster set", options); final CardEdition chooseEd = SGuiChoose.one(Localizer.getInstance().getMessage("lblChooseBonusBoosterSet"), options);
if (customBooster) { if (customBooster) {
List<PaperCard> cards = FModel.getMagicDb().getCommonCards().getAllCards(Predicates.printedInSet(chooseEd.getCode())); List<PaperCard> cards = FModel.getMagicDb().getCommonCards().getAllCards(Predicates.printedInSet(chooseEd.getCode()));
@@ -578,7 +579,7 @@ public class QuestWinLoseController {
} }
qData.getCards().addAllCards(cardsWon); qData.getCards().addAllCards(cardsWon);
title = "Bonus " + chooseEd.getName() + " Booster Pack!"; title = Localizer.getInstance().getMessage("lblBonusSetBoosterPack", chooseEd.getName());
} }
@@ -606,18 +607,14 @@ public class QuestWinLoseController {
private void awardChallengeWin() { private void awardChallengeWin() {
final long questRewardCredits = ((QuestEventChallenge) qEvent).getCreditsReward(); final long questRewardCredits = ((QuestEventChallenge) qEvent).getCreditsReward();
final StringBuilder sb = new StringBuilder();
sb.append("Challenge completed.\n\n");
sb.append("Challenge bounty: ").append(questRewardCredits).append(" credits.");
String winMessage = ((QuestEventChallenge)qEvent).getWinMessage(); String winMessage = ((QuestEventChallenge)qEvent).getWinMessage();
if (!winMessage.isEmpty()) { if (!winMessage.isEmpty()) {
view.showMessage(winMessage.replace("\\n", "\n"), "Congratulations", FSkinProp.ICO_QUEST_NOTES); view.showMessage(winMessage.replace("\\n", "\n"), Localizer.getInstance().getMessage("lblCongratulations"), FSkinProp.ICO_QUEST_NOTES);
} }
qData.getAssets().addCredits(questRewardCredits); qData.getAssets().addCredits(questRewardCredits);
view.showMessage(sb.toString(), "Challenge Rewards for \"" + qEvent.getTitle() + "\"", FSkinProp.ICO_QUEST_BOX); view.showMessage(Localizer.getInstance().getMessage("lblChallengeCompletedBountyIS", String.valueOf(questRewardCredits)), Localizer.getInstance().getMessage("lblChallengeRewardsForEvent", qEvent.getTitle()), FSkinProp.ICO_QUEST_BOX);
awardSpecialReward(null); awardSpecialReward(null);
} }
@@ -676,7 +673,7 @@ public class QuestWinLoseController {
private void penalizeLoss() { private void penalizeLoss() {
final int x = FModel.getQuestPreferences().getPrefInt(QPref.PENALTY_LOSS); final int x = FModel.getQuestPreferences().getPrefInt(QPref.PENALTY_LOSS);
view.showMessage("You lose! You have lost " + x + " credits.", "Gameplay Results", FSkinProp.ICO_QUEST_HEART); view.showMessage(Localizer.getInstance().getMessage("lblYouHaveLostNCredits", String.valueOf(x)), Localizer.getInstance().getMessage("lblGameplayResults"), FSkinProp.ICO_QUEST_HEART);
} }
/** /**

7
forge-gui/src/main/java/forge/util/gui/SOptionPane.java
View File

@@ -6,6 +6,7 @@ import com.google.common.collect.ImmutableList;
import forge.GuiBase; import forge.GuiBase;
import forge.assets.FSkinProp; import forge.assets.FSkinProp;
import forge.util.Localizer;
public class SOptionPane { public class SOptionPane {
public static final FSkinProp QUESTION_ICON = FSkinProp.ICO_QUESTION; public static final FSkinProp QUESTION_ICON = FSkinProp.ICO_QUESTION;
@@ -30,7 +31,7 @@ public class SOptionPane {
} }
public static void showMessageDialog(final String message, final String title, final FSkinProp icon) { public static void showMessageDialog(final String message, final String title, final FSkinProp icon) {
showOptionDialog(message, title, icon, ImmutableList.of("OK"), 0); showOptionDialog(message, title, icon, ImmutableList.of(Localizer.getInstance().getMessage("lblOK")), 0);
} }
public static boolean showConfirmDialog(final String message) { public static boolean showConfirmDialog(final String message) {
@@ -38,11 +39,11 @@ public class SOptionPane {
} }
public static boolean showConfirmDialog(final String message, final String title) { public static boolean showConfirmDialog(final String message, final String title) {
return showConfirmDialog(message, title, "Yes", "No", true); return showConfirmDialog(message, title, Localizer.getInstance().getMessage("lblYes"), Localizer.getInstance().getMessage("lblNo"), true);
} }
public static boolean showConfirmDialog(final String message, final String title, final boolean defaultYes) { public static boolean showConfirmDialog(final String message, final String title, final boolean defaultYes) {
return showConfirmDialog(message, title, "Yes", "No", defaultYes); return showConfirmDialog(message, title, Localizer.getInstance().getMessage("lblYes"), Localizer.getInstance().getMessage("lblNo"), defaultYes);
} }
public static boolean showConfirmDialog(final String message, final String title, final String yesButtonText, final String noButtonText) { public static boolean showConfirmDialog(final String message, final String title, final String yesButtonText, final String noButtonText) {