From 72d16f06362379d44d468c6f76020a1b15a4ed11 Mon Sep 17 00:00:00 2001 From: CCTV-1 Date: Sat, 18 Jan 2020 14:05:40 +0800 Subject: [PATCH] translate some text --- .../java/forge/game/player/PlayerView.java | 29 +++++----- .../main/java/forge/gui/CardListChooser.java | 10 +++- .../forge/screens/match/views/VStack.java | 53 ++++++++++--------- .../src/forge/itemmanager/ItemManager.java | 2 +- .../src/forge/screens/match/views/VStack.java | 8 +-- 5 files changed, 54 insertions(+), 48 deletions(-) diff --git a/forge-game/src/main/java/forge/game/player/PlayerView.java b/forge-game/src/main/java/forge/game/player/PlayerView.java index 735c0709f1b..3c979739c8c 100644 --- a/forge-game/src/main/java/forge/game/player/PlayerView.java +++ b/forge-game/src/main/java/forge/game/player/PlayerView.java @@ -29,6 +29,8 @@ import forge.trackable.Tracker; import forge.util.collect.FCollection; import forge.util.collect.FCollectionView; import forge.util.Lang; +import forge.util.Localizer; +import forge.util.CardTranslation; public class PlayerView extends GameEntityView { private static final long serialVersionUID = 7005892740909549086L; @@ -122,8 +124,7 @@ public class PlayerView extends GameEntityView { for (final PlayerView p : Iterables.concat(Collections.singleton(this), opponents)) { final int damage = p.getCommanderDamage(v); if (damage > 0) { - final String text = TextUtil.concatWithSpace("Commander damage to", p.toString(),"from", TextUtil.addSuffix(v.getName(),":")); - sb.append(TextUtil.concatWithSpace(text, TextUtil.addSuffix(String.valueOf(damage),"\r\n"))); + sb.append(Localizer.getInstance().getMessage("lblCommanderDealNDamageToPlayer", p.toString(), CardTranslation.getTranslatedName(v.getName()), String.valueOf(damage))); } } return sb.toString(); @@ -149,8 +150,7 @@ public class PlayerView extends GameEntityView { for (final CardView v : commanders) { final int damage = getCommanderDamage(v); if (damage > 0) { - final String text = TextUtil.concatWithSpace("Commander damage from own commander", TextUtil.addSuffix(v.toString(),":")); - info.add(TextUtil.concatWithSpace(text,TextUtil.addSuffix(String.valueOf(damage),"\r\n"))); + info.add(Localizer.getInstance().getMessage("lblNCommanderDamageFromOwnCommander", CardTranslation.getTranslatedName(v.getName()), String.valueOf(damage))); } } @@ -159,8 +159,7 @@ public class PlayerView extends GameEntityView { for (final CardView v : p.getCommanders()) { final int damage = getCommanderDamage(v); if (damage > 0) { - final String text = TextUtil.concatWithSpace("Commander damage from", TextUtil.addSuffix(p.toString(),"'s"), TextUtil.addSuffix(v.toString(),":")); - info.add(TextUtil.concatWithSpace(text,TextUtil.addSuffix(String.valueOf(damage),"\r\n"))); + info.add(Localizer.getInstance().getMessage("lblNCommanderDamageFromPlayerCommander", p.toString(), CardTranslation.getTranslatedName(v.getName()), String.valueOf(damage))); } } } @@ -234,7 +233,7 @@ public class PlayerView extends GameEntityView { } public String getMaxHandString() { - return hasUnlimitedHandSize() ? "unlimited" : String.valueOf(getMaxHandSize()); + return hasUnlimitedHandSize() ? Localizer.getInstance().getMessage("lblUnlimited") : String.valueOf(getMaxHandSize()); } public int getNumDrawnThisTurn() { @@ -438,32 +437,32 @@ public class PlayerView extends GameEntityView { private List getDetailsList() { final List details = Lists.newArrayListWithCapacity(8); - details.add(TextUtil.concatWithSpace("Life:", String.valueOf(getLife()))); + details.add(Localizer.getInstance().getMessage("lblLifeHas", String.valueOf(getLife()))); Map counters = getCounters(); if (counters != null) { for (Entry p : counters.entrySet()) { if (p.getValue() > 0) { - details.add(TextUtil.concatWithSpace(p.getKey().getName(), "counters:", String.valueOf(p.getValue()))); + details.add(Localizer.getInstance().getMessage("lblTypeCounterHas", p.getKey().getName(), String.valueOf(p.getValue()))); } } } - details.add(TextUtil.concatNoSpace("Cards in hand: ", TextUtil.addSuffix(String.valueOf(getHandSize()),"/"), getMaxHandString())); - details.add(TextUtil.concatWithSpace("Cards drawn this turn:", String.valueOf(getNumDrawnThisTurn()))); - details.add(TextUtil.concatWithSpace("Damage prevention:", String.valueOf(getPreventNextDamage()))); + details.add(Localizer.getInstance().getMessage("lblCardInHandHas", String.valueOf(getHandSize()), getMaxHandString())); + details.add(Localizer.getInstance().getMessage("lblCardDrawnThisTurnHas", String.valueOf(getNumDrawnThisTurn()))); + details.add(Localizer.getInstance().getMessage("lblDamagepreventionHas", String.valueOf(getPreventNextDamage()))); if (getIsExtraTurn()) { - details.add("Extra Turn: Yes"); + details.add(Localizer.getInstance().getMessage("lblIsExtraTurn")); } - details.add(TextUtil.concatWithSpace("Extra Turn Count:", String.valueOf(getExtraTurnCount()))); + details.add(Localizer.getInstance().getMessage("lblExtraTurnCountHas", String.valueOf(getExtraTurnCount()))); final String keywords = Lang.joinHomogenous(getDisplayableKeywords()); if (!keywords.isEmpty()) { details.add(keywords); } final FCollectionView ante = getAnte(); if (ante != null && !ante.isEmpty()) { - details.add(TextUtil.concatWithSpace("Ante'd:", Lang.joinHomogenous(ante))); + details.add(Localizer.getInstance().getMessage("lblAntedHas", Lang.joinHomogenous(ante))); } details.addAll(getPlayerCommanderInfo()); return details; diff --git a/forge-gui-desktop/src/main/java/forge/gui/CardListChooser.java b/forge-gui-desktop/src/main/java/forge/gui/CardListChooser.java index 958497efbfb..068ef7e4598 100644 --- a/forge-gui-desktop/src/main/java/forge/gui/CardListChooser.java +++ b/forge-gui-desktop/src/main/java/forge/gui/CardListChooser.java @@ -27,6 +27,8 @@ import forge.toolbox.FLabel; import forge.toolbox.FOptionPane; import forge.toolbox.FScrollPane; import forge.view.FDialog; +import forge.util.Localizer; +import forge.util.CardTranslation; import javax.swing.*; import javax.swing.event.ListSelectionEvent; @@ -68,7 +70,7 @@ public class CardListChooser extends FDialog { this.addWindowFocusListener(new CardListFocuser()); - FButton btnOK = new FButton("Select Card"); + FButton btnOK = new FButton(Localizer.getInstance().getMessage("lblSelectCard")); btnOK.addActionListener(new ActionListener() { @Override public void actionPerformed(final ActionEvent e) { @@ -88,7 +90,11 @@ public class CardListChooser extends FDialog { @Override public void windowClosing(final WindowEvent e) { - if (FOptionPane.showConfirmDialog("Are you sure you want to pick '" + jList.getSelectedValue().getName() + "'?", "Select this card?", false)) { + //CardTranslation.getTranslatedName + if (FOptionPane.showConfirmDialog( + Localizer.getInstance().getMessage("lblAreYouSureWantPickCard", CardTranslation.getTranslatedName(jList.getSelectedValue().getName())), + Localizer.getInstance().getMessage("lblSelectThisCardConfirm"), false) + ) { dispose(); } } diff --git a/forge-gui-desktop/src/main/java/forge/screens/match/views/VStack.java b/forge-gui-desktop/src/main/java/forge/screens/match/views/VStack.java index 57684af6622..86db942e4c6 100644 --- a/forge-gui-desktop/src/main/java/forge/screens/match/views/VStack.java +++ b/forge-gui-desktop/src/main/java/forge/screens/match/views/VStack.java @@ -34,6 +34,7 @@ import forge.toolbox.FScrollPanel; import forge.toolbox.FSkin; import forge.toolbox.FSkin.SkinnedTextArea; import forge.util.collect.FCollectionView; +import forge.util.Localizer; import net.miginfocom.swing.MigLayout; import javax.swing.*; @@ -54,7 +55,7 @@ public class VStack implements IVDoc { // Fields used with interface IVDoc private DragCell parentCell; - private final DragTab tab = new DragTab("Stack"); + private final DragTab tab = new DragTab(Localizer.getInstance().getMessage("lblStack")); // Top-level containers private final FScrollPanel scroller = new FScrollPanel(new MigLayout("insets 0, gap 0, wrap"), true, @@ -113,7 +114,7 @@ public class VStack implements IVDoc { } final FCollectionView items = model.getStack(); - tab.setText("Stack : " + items.size()); + tab.setText(Localizer.getInstance().getMessage("lblStack") + " : " + items.size()); // No need to update the rest unless it's showing if (!parentCell.getSelected().equals(this)) { return; } @@ -191,41 +192,41 @@ public class VStack implements IVDoc { if (hoveredItem == null) { // set things up to draw an arc from it... - hoveredItem = StackInstanceTextArea.this; - controller.getMatchUI().setCard(item.getSourceCard()); + hoveredItem = StackInstanceTextArea.this; + controller.getMatchUI().setCard(item.getSourceCard()); } addMouseListener(new MouseAdapter() { @Override public void mouseEntered(final MouseEvent e) { - if (controller.getMatchUI().getCDock().getArcState() == ArcState.MOUSEOVER) { - hoveredItem = StackInstanceTextArea.this; - } - controller.getMatchUI().setCard(item.getSourceCard()); + if (controller.getMatchUI().getCDock().getArcState() == ArcState.MOUSEOVER) { + hoveredItem = StackInstanceTextArea.this; + } + controller.getMatchUI().setCard(item.getSourceCard()); } @Override public void mouseExited(final MouseEvent e) { - if (controller.getMatchUI().getCDock().getArcState() == ArcState.MOUSEOVER) { - if (hoveredItem == StackInstanceTextArea.this) { - hoveredItem = null; - } - } + if (controller.getMatchUI().getCDock().getArcState() == ArcState.MOUSEOVER) { + if (hoveredItem == StackInstanceTextArea.this) { + hoveredItem = null; + } + } } @Override public void mouseClicked(final MouseEvent e) { - if (controller.getMatchUI().getCDock().getArcState() == ArcState.ON) { - if (hoveredItem == StackInstanceTextArea.this) { - hoveredItem = null; - } - else - { - hoveredItem = StackInstanceTextArea.this; - controller.getMatchUI().setCard(item.getSourceCard()); - } - } + if (controller.getMatchUI().getCDock().getArcState() == ArcState.ON) { + if (hoveredItem == StackInstanceTextArea.this) { + hoveredItem = null; + } + else + { + hoveredItem = StackInstanceTextArea.this; + controller.getMatchUI().setCard(item.getSourceCard()); + } + } } }); @@ -287,7 +288,7 @@ public class VStack implements IVDoc { private Integer triggerID = 0; public AbilityMenu(){ - jmiAutoYield = new JCheckBoxMenuItem("Auto-Yield"); + jmiAutoYield = new JCheckBoxMenuItem(Localizer.getInstance().getMessage("cbpAutoYieldMode")); jmiAutoYield.addActionListener(new ActionListener() { @Override public void actionPerformed(final ActionEvent arg0) { @@ -302,7 +303,7 @@ public class VStack implements IVDoc { }); add(jmiAutoYield); - jmiAlwaysYes = new JCheckBoxMenuItem("Always Yes"); + jmiAlwaysYes = new JCheckBoxMenuItem(Localizer.getInstance().getMessage("lblAlwaysYes")); jmiAlwaysYes.addActionListener(new ActionListener() { @Override public void actionPerformed(final ActionEvent arg0) { @@ -316,7 +317,7 @@ public class VStack implements IVDoc { }); add(jmiAlwaysYes); - jmiAlwaysNo = new JCheckBoxMenuItem("Always No"); + jmiAlwaysNo = new JCheckBoxMenuItem(Localizer.getInstance().getMessage("lblAlwaysNo")); jmiAlwaysNo.addActionListener(new ActionListener() { @Override public void actionPerformed(final ActionEvent arg0) { diff --git a/forge-gui-mobile/src/forge/itemmanager/ItemManager.java b/forge-gui-mobile/src/forge/itemmanager/ItemManager.java index 93c09888cd2..64e1a239a00 100644 --- a/forge-gui-mobile/src/forge/itemmanager/ItemManager.java +++ b/forge-gui-mobile/src/forge/itemmanager/ItemManager.java @@ -973,7 +973,7 @@ public abstract class ItemManager extends FContainer im @Override public String getActivateAction(int index) { if (contextMenuBuilder != null) { - return "select card"; + return Localizer.getInstance().getMessage("lblSelectCard"); } return null; } diff --git a/forge-gui-mobile/src/forge/screens/match/views/VStack.java b/forge-gui-mobile/src/forge/screens/match/views/VStack.java index d37c64f4c8c..f131139b806 100644 --- a/forge-gui-mobile/src/forge/screens/match/views/VStack.java +++ b/forge-gui-mobile/src/forge/screens/match/views/VStack.java @@ -272,7 +272,7 @@ public class VStack extends FDropDown { protected void buildMenu() { final String key = stackInstance.getKey(); final boolean autoYield = gui.shouldAutoYield(key); - addItem(new FCheckBoxMenuItem("Auto-Yield", autoYield, + addItem(new FCheckBoxMenuItem(Localizer.getInstance().getMessage("cbpAutoYieldMode"), autoYield, new FEventHandler() { @Override public void handleEvent(FEvent e) { @@ -285,7 +285,7 @@ public class VStack extends FDropDown { })); if (stackInstance.isOptionalTrigger() && stackInstance.getActivatingPlayer().equals(player)) { final int triggerID = stackInstance.getSourceTrigger(); - addItem(new FCheckBoxMenuItem("Always Yes", + addItem(new FCheckBoxMenuItem(Localizer.getInstance().getMessage("lblAlwaysYes"), gui.shouldAlwaysAcceptTrigger(triggerID), new FEventHandler() { @Override @@ -302,7 +302,7 @@ public class VStack extends FDropDown { } } })); - addItem(new FCheckBoxMenuItem("Always No", + addItem(new FCheckBoxMenuItem(Localizer.getInstance().getMessage("lblAlwaysNo"), gui.shouldAlwaysDeclineTrigger(triggerID), new FEventHandler() { @Override @@ -320,7 +320,7 @@ public class VStack extends FDropDown { } })); } - addItem(new FMenuItem("Zoom/Details", new FEventHandler() { + addItem(new FMenuItem(Localizer.getInstance().getMessage("lblZoomOrDetails"), new FEventHandler() { @Override public void handleEvent(FEvent e) { CardZoom.show(stackInstance.getSourceCard());