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

translate some text

Browse Source
This commit is contained in:
CCTV-1
2020-01-18 14:05:40 +08:00
parent e265cb84cc
commit 72d16f0636
5 changed files with 54 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
forge-game/src/main/java/forge/game/player/PlayerView.java
View File

@@ -29,6 +29,8 @@ import forge.trackable.Tracker;
import forge.util.collect.FCollection; import forge.util.collect.FCollection;
import forge.util.collect.FCollectionView; import forge.util.collect.FCollectionView;
import forge.util.Lang; import forge.util.Lang;
import forge.util.Localizer;
import forge.util.CardTranslation;
public class PlayerView extends GameEntityView { public class PlayerView extends GameEntityView {
private static final long serialVersionUID = 7005892740909549086L; 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)) { for (final PlayerView p : Iterables.concat(Collections.singleton(this), opponents)) {
final int damage = p.getCommanderDamage(v); final int damage = p.getCommanderDamage(v);
if (damage > 0) { if (damage > 0) {
final String text = TextUtil.concatWithSpace("Commander damage to", p.toString(),"from", TextUtil.addSuffix(v.getName(),":")); sb.append(Localizer.getInstance().getMessage("lblCommanderDealNDamageToPlayer", p.toString(), CardTranslation.getTranslatedName(v.getName()), String.valueOf(damage)));
sb.append(TextUtil.concatWithSpace(text, TextUtil.addSuffix(String.valueOf(damage),"\r\n")));
} }
} }
return sb.toString(); return sb.toString();
@@ -149,8 +150,7 @@ public class PlayerView extends GameEntityView {
for (final CardView v : commanders) { for (final CardView v : commanders) {
final int damage = getCommanderDamage(v); final int damage = getCommanderDamage(v);
if (damage > 0) { if (damage > 0) {
final String text = TextUtil.concatWithSpace("Commander damage from own commander", TextUtil.addSuffix(v.toString(),":")); info.add(Localizer.getInstance().getMessage("lblNCommanderDamageFromOwnCommander", CardTranslation.getTranslatedName(v.getName()), String.valueOf(damage)));
info.add(TextUtil.concatWithSpace(text,TextUtil.addSuffix(String.valueOf(damage),"\r\n")));
} }
} }
@@ -159,8 +159,7 @@ public class PlayerView extends GameEntityView {
for (final CardView v : p.getCommanders()) { for (final CardView v : p.getCommanders()) {
final int damage = getCommanderDamage(v); final int damage = getCommanderDamage(v);
if (damage > 0) { if (damage > 0) {
final String text = TextUtil.concatWithSpace("Commander damage from", TextUtil.addSuffix(p.toString(),"'s"), TextUtil.addSuffix(v.toString(),":")); info.add(Localizer.getInstance().getMessage("lblNCommanderDamageFromPlayerCommander", p.toString(), CardTranslation.getTranslatedName(v.getName()), String.valueOf(damage)));
info.add(TextUtil.concatWithSpace(text,TextUtil.addSuffix(String.valueOf(damage),"\r\n")));
} }
} }
} }
@@ -234,7 +233,7 @@ public class PlayerView extends GameEntityView {
} }
public String getMaxHandString() { public String getMaxHandString() {
return hasUnlimitedHandSize() ? "unlimited" : String.valueOf(getMaxHandSize()); return hasUnlimitedHandSize() ? Localizer.getInstance().getMessage("lblUnlimited") : String.valueOf(getMaxHandSize());
} }
public int getNumDrawnThisTurn() { public int getNumDrawnThisTurn() {
@@ -438,32 +437,32 @@ public class PlayerView extends GameEntityView {
private List<String> getDetailsList() { private List<String> getDetailsList() {
final List<String> details = Lists.newArrayListWithCapacity(8); final List<String> details = Lists.newArrayListWithCapacity(8);
details.add(TextUtil.concatWithSpace("Life:", String.valueOf(getLife()))); details.add(Localizer.getInstance().getMessage("lblLifeHas", String.valueOf(getLife())));
Map<CounterType, Integer> counters = getCounters(); Map<CounterType, Integer> counters = getCounters();
if (counters != null) { if (counters != null) {
for (Entry<CounterType, Integer> p : counters.entrySet()) { for (Entry<CounterType, Integer> p : counters.entrySet()) {
if (p.getValue() > 0) { 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(Localizer.getInstance().getMessage("lblCardInHandHas", String.valueOf(getHandSize()), getMaxHandString()));
details.add(TextUtil.concatWithSpace("Cards drawn this turn:", String.valueOf(getNumDrawnThisTurn()))); details.add(Localizer.getInstance().getMessage("lblCardDrawnThisTurnHas", String.valueOf(getNumDrawnThisTurn())));
details.add(TextUtil.concatWithSpace("Damage prevention:", String.valueOf(getPreventNextDamage()))); details.add(Localizer.getInstance().getMessage("lblDamagepreventionHas", String.valueOf(getPreventNextDamage())));
if (getIsExtraTurn()) { 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()); final String keywords = Lang.joinHomogenous(getDisplayableKeywords());
if (!keywords.isEmpty()) { if (!keywords.isEmpty()) {
details.add(keywords); details.add(keywords);
} }
final FCollectionView<CardView> ante = getAnte(); final FCollectionView<CardView> ante = getAnte();
if (ante != null && !ante.isEmpty()) { 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()); details.addAll(getPlayerCommanderInfo());
return details; return details;

10
forge-gui-desktop/src/main/java/forge/gui/CardListChooser.java
View File

@@ -27,6 +27,8 @@ import forge.toolbox.FLabel;
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;
import forge.util.CardTranslation;
import javax.swing.*; import javax.swing.*;
import javax.swing.event.ListSelectionEvent; import javax.swing.event.ListSelectionEvent;
@@ -68,7 +70,7 @@ public class CardListChooser extends FDialog {
this.addWindowFocusListener(new CardListFocuser()); this.addWindowFocusListener(new CardListFocuser());
FButton btnOK = new FButton("Select Card"); FButton btnOK = new FButton(Localizer.getInstance().getMessage("lblSelectCard"));
btnOK.addActionListener(new ActionListener() { btnOK.addActionListener(new ActionListener() {
@Override @Override
public void actionPerformed(final ActionEvent e) { public void actionPerformed(final ActionEvent e) {
@@ -88,7 +90,11 @@ public class CardListChooser extends FDialog {
@Override @Override
public void windowClosing(final WindowEvent e) { 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(); dispose();
} }
} }

53
forge-gui-desktop/src/main/java/forge/screens/match/views/VStack.java
View File

@@ -34,6 +34,7 @@ import forge.toolbox.FScrollPanel;
import forge.toolbox.FSkin; import forge.toolbox.FSkin;
import forge.toolbox.FSkin.SkinnedTextArea; import forge.toolbox.FSkin.SkinnedTextArea;
import forge.util.collect.FCollectionView; import forge.util.collect.FCollectionView;
import forge.util.Localizer;
import net.miginfocom.swing.MigLayout; import net.miginfocom.swing.MigLayout;
import javax.swing.*; import javax.swing.*;
@@ -54,7 +55,7 @@ public class VStack implements IVDoc<CStack> {
// Fields used with interface IVDoc // Fields used with interface IVDoc
private DragCell parentCell; private DragCell parentCell;
private final DragTab tab = new DragTab("Stack"); private final DragTab tab = new DragTab(Localizer.getInstance().getMessage("lblStack"));
// Top-level containers // Top-level containers
private final FScrollPanel scroller = new FScrollPanel(new MigLayout("insets 0, gap 0, wrap"), true, private final FScrollPanel scroller = new FScrollPanel(new MigLayout("insets 0, gap 0, wrap"), true,
@@ -113,7 +114,7 @@ public class VStack implements IVDoc<CStack> {
} }
final FCollectionView<StackItemView> items = model.getStack(); final FCollectionView<StackItemView> 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 // No need to update the rest unless it's showing
if (!parentCell.getSelected().equals(this)) { return; } if (!parentCell.getSelected().equals(this)) { return; }
@@ -191,41 +192,41 @@ public class VStack implements IVDoc<CStack> {
if (hoveredItem == null) if (hoveredItem == null)
{ {
// set things up to draw an arc from it... // set things up to draw an arc from it...
hoveredItem = StackInstanceTextArea.this; hoveredItem = StackInstanceTextArea.this;
controller.getMatchUI().setCard(item.getSourceCard()); controller.getMatchUI().setCard(item.getSourceCard());
} }
addMouseListener(new MouseAdapter() { addMouseListener(new MouseAdapter() {
@Override @Override
public void mouseEntered(final MouseEvent e) { public void mouseEntered(final MouseEvent e) {
if (controller.getMatchUI().getCDock().getArcState() == ArcState.MOUSEOVER) { if (controller.getMatchUI().getCDock().getArcState() == ArcState.MOUSEOVER) {
hoveredItem = StackInstanceTextArea.this; hoveredItem = StackInstanceTextArea.this;
} }
controller.getMatchUI().setCard(item.getSourceCard()); controller.getMatchUI().setCard(item.getSourceCard());
} }
@Override @Override
public void mouseExited(final MouseEvent e) { public void mouseExited(final MouseEvent e) {
if (controller.getMatchUI().getCDock().getArcState() == ArcState.MOUSEOVER) { if (controller.getMatchUI().getCDock().getArcState() == ArcState.MOUSEOVER) {
if (hoveredItem == StackInstanceTextArea.this) { if (hoveredItem == StackInstanceTextArea.this) {
hoveredItem = null; hoveredItem = null;
} }
} }
} }
@Override @Override
public void mouseClicked(final MouseEvent e) { public void mouseClicked(final MouseEvent e) {
if (controller.getMatchUI().getCDock().getArcState() == ArcState.ON) { if (controller.getMatchUI().getCDock().getArcState() == ArcState.ON) {
if (hoveredItem == StackInstanceTextArea.this) { if (hoveredItem == StackInstanceTextArea.this) {
hoveredItem = null; hoveredItem = null;
} }
else else
{ {
hoveredItem = StackInstanceTextArea.this; hoveredItem = StackInstanceTextArea.this;
controller.getMatchUI().setCard(item.getSourceCard()); controller.getMatchUI().setCard(item.getSourceCard());
} }
} }
} }
}); });
@@ -287,7 +288,7 @@ public class VStack implements IVDoc<CStack> {
private Integer triggerID = 0; private Integer triggerID = 0;
public AbilityMenu(){ public AbilityMenu(){
jmiAutoYield = new JCheckBoxMenuItem("Auto-Yield"); jmiAutoYield = new JCheckBoxMenuItem(Localizer.getInstance().getMessage("cbpAutoYieldMode"));
jmiAutoYield.addActionListener(new ActionListener() { jmiAutoYield.addActionListener(new ActionListener() {
@Override @Override
public void actionPerformed(final ActionEvent arg0) { public void actionPerformed(final ActionEvent arg0) {
@@ -302,7 +303,7 @@ public class VStack implements IVDoc<CStack> {
}); });
add(jmiAutoYield); add(jmiAutoYield);
jmiAlwaysYes = new JCheckBoxMenuItem("Always Yes"); jmiAlwaysYes = new JCheckBoxMenuItem(Localizer.getInstance().getMessage("lblAlwaysYes"));
jmiAlwaysYes.addActionListener(new ActionListener() { jmiAlwaysYes.addActionListener(new ActionListener() {
@Override @Override
public void actionPerformed(final ActionEvent arg0) { public void actionPerformed(final ActionEvent arg0) {
@@ -316,7 +317,7 @@ public class VStack implements IVDoc<CStack> {
}); });
add(jmiAlwaysYes); add(jmiAlwaysYes);
jmiAlwaysNo = new JCheckBoxMenuItem("Always No"); jmiAlwaysNo = new JCheckBoxMenuItem(Localizer.getInstance().getMessage("lblAlwaysNo"));
jmiAlwaysNo.addActionListener(new ActionListener() { jmiAlwaysNo.addActionListener(new ActionListener() {
@Override @Override
public void actionPerformed(final ActionEvent arg0) { public void actionPerformed(final ActionEvent arg0) {

2
forge-gui-mobile/src/forge/itemmanager/ItemManager.java
View File

@@ -973,7 +973,7 @@ public abstract class ItemManager<T extends InventoryItem> extends FContainer im
@Override @Override
public String getActivateAction(int index) { public String getActivateAction(int index) {
if (contextMenuBuilder != null) { if (contextMenuBuilder != null) {
return "select card"; return Localizer.getInstance().getMessage("lblSelectCard");
} }
return null; return null;
} }

8
forge-gui-mobile/src/forge/screens/match/views/VStack.java
View File

@@ -272,7 +272,7 @@ public class VStack extends FDropDown {
protected void buildMenu() { protected void buildMenu() {
final String key = stackInstance.getKey(); final String key = stackInstance.getKey();
final boolean autoYield = gui.shouldAutoYield(key); final boolean autoYield = gui.shouldAutoYield(key);
addItem(new FCheckBoxMenuItem("Auto-Yield", autoYield, addItem(new FCheckBoxMenuItem(Localizer.getInstance().getMessage("cbpAutoYieldMode"), autoYield,
new FEventHandler() { new FEventHandler() {
@Override @Override
public void handleEvent(FEvent e) { public void handleEvent(FEvent e) {
@@ -285,7 +285,7 @@ public class VStack extends FDropDown {
})); }));
if (stackInstance.isOptionalTrigger() && stackInstance.getActivatingPlayer().equals(player)) { if (stackInstance.isOptionalTrigger() && stackInstance.getActivatingPlayer().equals(player)) {
final int triggerID = stackInstance.getSourceTrigger(); final int triggerID = stackInstance.getSourceTrigger();
addItem(new FCheckBoxMenuItem("Always Yes", addItem(new FCheckBoxMenuItem(Localizer.getInstance().getMessage("lblAlwaysYes"),
gui.shouldAlwaysAcceptTrigger(triggerID), gui.shouldAlwaysAcceptTrigger(triggerID),
new FEventHandler() { new FEventHandler() {
@Override @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), gui.shouldAlwaysDeclineTrigger(triggerID),
new FEventHandler() { new FEventHandler() {
@Override @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 @Override
public void handleEvent(FEvent e) { public void handleEvent(FEvent e) {
CardZoom.show(stackInstance.getSourceCard()); CardZoom.show(stackInstance.getSourceCard());