From f17d2bf7fc177e2ebc970b6688a2906a115f854d Mon Sep 17 00:00:00 2001 From: klaxnek Date: Wed, 23 Oct 2019 00:24:15 +0200 Subject: [PATCH] Translate Trigger Abilities. Finished. --- .../forge/game/trigger/TriggerCycled.java | 3 +- .../game/trigger/TriggerDamageDealtOnce.java | 7 +- .../forge/game/trigger/TriggerDamageDone.java | 7 +- .../game/trigger/TriggerDamageDoneOnce.java | 5 +- .../game/trigger/TriggerDamagePrevented.java | 7 +- .../trigger/TriggerDamagePreventedOnce.java | 5 +- .../forge/game/trigger/TriggerDestroyed.java | 5 +- .../forge/game/trigger/TriggerDevoured.java | 3 +- .../forge/game/trigger/TriggerDiscarded.java | 5 +- .../java/forge/game/trigger/TriggerDrawn.java | 3 +- .../forge/game/trigger/TriggerEvolved.java | 3 +- .../forge/game/trigger/TriggerExerted.java | 3 +- .../forge/game/trigger/TriggerExiled.java | 3 +- .../forge/game/trigger/TriggerExploited.java | 5 +- .../forge/game/trigger/TriggerExplores.java | 3 +- .../java/forge/game/trigger/TriggerFight.java | 3 +- .../game/trigger/TriggerFlippedCoin.java | 3 +- .../game/trigger/TriggerInvestigated.java | 3 +- .../forge/game/trigger/TriggerLandPlayed.java | 3 +- .../forge/game/trigger/TriggerLifeGained.java | 5 +- .../forge/game/trigger/TriggerLifeLost.java | 5 +- .../forge/game/trigger/TriggerLosesGame.java | 3 +- .../trigger/TriggerPayCumulativeUpkeep.java | 3 +- .../forge/game/trigger/TriggerPayLife.java | 5 +- .../forge/game/trigger/TriggerPhaseIn.java | 3 +- .../forge/game/trigger/TriggerPhaseOut.java | 3 +- .../forge/game/trigger/TriggerPlanarDice.java | 3 +- .../game/trigger/TriggerPlaneswalkedFrom.java | 3 +- .../game/trigger/TriggerPlaneswalkedTo.java | 3 +- .../game/trigger/TriggerRegenerated.java | 3 +- .../forge/game/trigger/TriggerRevealed.java | 3 +- .../forge/game/trigger/TriggerSacrificed.java | 3 +- .../java/forge/game/trigger/TriggerScry.java | 3 +- .../game/trigger/TriggerSearchedLibrary.java | 3 +- .../forge/game/trigger/TriggerShuffled.java | 3 +- .../game/trigger/TriggerSpellAbilityCast.java | 7 +- .../game/trigger/TriggerSpellAbilityCopy.java | 7 +- .../forge/game/trigger/TriggerSurveil.java | 3 +- .../java/forge/game/trigger/TriggerTaps.java | 3 +- .../game/trigger/TriggerTapsForMana.java | 5 +- .../game/trigger/TriggerTransformed.java | 3 +- .../forge/game/trigger/TriggerTurnBegin.java | 3 +- .../forge/game/trigger/TriggerTurnFaceUp.java | 3 +- .../forge/game/trigger/TriggerUnattach.java | 5 +- .../forge/game/trigger/TriggerUntaps.java | 3 +- .../java/forge/game/trigger/TriggerVote.java | 3 +- forge-gui/res/languages/de-DE.properties | 112 +++++++++++++++++- forge-gui/res/languages/en-US.properties | 79 +++++++++++- forge-gui/res/languages/es-ES.properties | 79 +++++++++++- forge-gui/res/languages/zh-CN.properties | 112 +++++++++++++++++- 50 files changed, 490 insertions(+), 70 deletions(-) diff --git a/forge-game/src/main/java/forge/game/trigger/TriggerCycled.java b/forge-game/src/main/java/forge/game/trigger/TriggerCycled.java index 32416714316..5da329a6360 100644 --- a/forge-game/src/main/java/forge/game/trigger/TriggerCycled.java +++ b/forge-game/src/main/java/forge/game/trigger/TriggerCycled.java @@ -20,6 +20,7 @@ package forge.game.trigger; import forge.game.ability.AbilityKey; import forge.game.card.Card; import forge.game.spellability.SpellAbility; +import forge.util.Localizer; import java.util.Map; @@ -58,7 +59,7 @@ public class TriggerCycled extends Trigger { @Override public String getImportantStackObjects(SpellAbility sa) { StringBuilder sb = new StringBuilder(); - sb.append("Cycled: ").append(sa.getTriggeringObject(AbilityKey.Card)); + sb.append(Localizer.getInstance().getMessage("lblCycled")).append(": ").append(sa.getTriggeringObject(AbilityKey.Card)); return sb.toString(); } diff --git a/forge-game/src/main/java/forge/game/trigger/TriggerDamageDealtOnce.java b/forge-game/src/main/java/forge/game/trigger/TriggerDamageDealtOnce.java index 5c6aafa1da8..be92e7a2929 100644 --- a/forge-game/src/main/java/forge/game/trigger/TriggerDamageDealtOnce.java +++ b/forge-game/src/main/java/forge/game/trigger/TriggerDamageDealtOnce.java @@ -22,6 +22,7 @@ import forge.game.ability.AbilityKey; import forge.game.card.Card; import forge.game.spellability.SpellAbility; import forge.util.Expressions; +import forge.util.Localizer; import java.util.Map; import java.util.Set; @@ -116,9 +117,9 @@ public class TriggerDamageDealtOnce extends Trigger { @Override public String getImportantStackObjects(SpellAbility sa) { StringBuilder sb = new StringBuilder(); - sb.append("Damage Source: ").append(sa.getTriggeringObject(AbilityKey.Source)).append(", "); - sb.append("Damaged: ").append(sa.getTriggeringObject(AbilityKey.Targets)).append(", "); - sb.append("Amount: ").append(sa.getTriggeringObject(AbilityKey.DamageAmount)); + sb.append(Localizer.getInstance().getMessage("lblDamageSource")).append(": ").append(sa.getTriggeringObject(AbilityKey.Source)).append(", "); + sb.append(Localizer.getInstance().getMessage("lblDamaged")).append(": ").append(sa.getTriggeringObject(AbilityKey.Targets)).append(", "); + sb.append(Localizer.getInstance().getMessage("lblAmount")).append(": ").append(sa.getTriggeringObject(AbilityKey.DamageAmount)); return sb.toString(); } } diff --git a/forge-game/src/main/java/forge/game/trigger/TriggerDamageDone.java b/forge-game/src/main/java/forge/game/trigger/TriggerDamageDone.java index 8ec27bb576e..0a41c3b53b4 100644 --- a/forge-game/src/main/java/forge/game/trigger/TriggerDamageDone.java +++ b/forge-game/src/main/java/forge/game/trigger/TriggerDamageDone.java @@ -23,6 +23,7 @@ import forge.game.card.CardUtil; import forge.game.spellability.SpellAbility; import forge.game.spellability.SpellAbilityStackInstance; import forge.util.Expressions; +import forge.util.Localizer; import java.util.Map; @@ -135,9 +136,9 @@ public class TriggerDamageDone extends Trigger { @Override public String getImportantStackObjects(SpellAbility sa) { StringBuilder sb = new StringBuilder(); - sb.append("Damage Source: ").append(sa.getTriggeringObject(AbilityKey.Source)).append(", "); - sb.append("Damaged: ").append(sa.getTriggeringObject(AbilityKey.Target)).append(", "); - sb.append("Amount: ").append(sa.getTriggeringObject(AbilityKey.DamageAmount)); + sb.append(Localizer.getInstance().getMessage("lblDamageSource")).append(": ").append(sa.getTriggeringObject(AbilityKey.Source)).append(", "); + sb.append(Localizer.getInstance().getMessage("lblDamaged")).append(": ").append(sa.getTriggeringObject(AbilityKey.Target)).append(", "); + sb.append(Localizer.getInstance().getMessage("lblAmount")).append(": ").append(sa.getTriggeringObject(AbilityKey.DamageAmount)); return sb.toString(); } } diff --git a/forge-game/src/main/java/forge/game/trigger/TriggerDamageDoneOnce.java b/forge-game/src/main/java/forge/game/trigger/TriggerDamageDoneOnce.java index 6abc7765a85..96233e6ccf7 100644 --- a/forge-game/src/main/java/forge/game/trigger/TriggerDamageDoneOnce.java +++ b/forge-game/src/main/java/forge/game/trigger/TriggerDamageDoneOnce.java @@ -7,6 +7,7 @@ import forge.game.GameEntity; import forge.game.ability.AbilityKey; import forge.game.card.Card; import forge.game.spellability.SpellAbility; +import forge.util.Localizer; public class TriggerDamageDoneOnce extends Trigger { @@ -67,9 +68,9 @@ public class TriggerDamageDoneOnce extends Trigger { public String getImportantStackObjects(SpellAbility sa) { StringBuilder sb = new StringBuilder(); if (sa.getTriggeringObject(AbilityKey.Target) != null) { - sb.append("Damaged: ").append(sa.getTriggeringObject(AbilityKey.Target)).append(", "); + sb.append(Localizer.getInstance().getMessage("lblDamaged")).append(": ").append(sa.getTriggeringObject(AbilityKey.Target)).append(", "); } - sb.append("Amount: ").append(sa.getTriggeringObject(AbilityKey.DamageAmount)); + sb.append(Localizer.getInstance().getMessage("lblAmount")).append(": ").append(sa.getTriggeringObject(AbilityKey.DamageAmount)); return sb.toString(); } diff --git a/forge-game/src/main/java/forge/game/trigger/TriggerDamagePrevented.java b/forge-game/src/main/java/forge/game/trigger/TriggerDamagePrevented.java index 1c0b739ed7f..d38b52f0675 100644 --- a/forge-game/src/main/java/forge/game/trigger/TriggerDamagePrevented.java +++ b/forge-game/src/main/java/forge/game/trigger/TriggerDamagePrevented.java @@ -22,6 +22,7 @@ import forge.game.card.Card; import forge.game.card.CardUtil; import forge.game.spellability.SpellAbility; import forge.util.Expressions; +import forge.util.Localizer; import java.util.Map; @@ -114,9 +115,9 @@ public class TriggerDamagePrevented extends Trigger { @Override public String getImportantStackObjects(SpellAbility sa) { StringBuilder sb = new StringBuilder(); - sb.append("Damage Source: ").append(sa.getTriggeringObject(AbilityKey.Source)).append(", "); - sb.append("Damage Target: ").append(sa.getTriggeringObject(AbilityKey.Target)).append(", "); - sb.append("Amount: ").append(sa.getTriggeringObject(AbilityKey.DamageAmount)); + sb.append(Localizer.getInstance().getMessage("lblDamageSource")).append(": ").append(sa.getTriggeringObject(AbilityKey.Source)).append(", "); + sb.append(Localizer.getInstance().getMessage("lblDamageTarget")).append(": ").append(sa.getTriggeringObject(AbilityKey.Target)).append(", "); + sb.append(Localizer.getInstance().getMessage("lblAmount")).append(": ").append(sa.getTriggeringObject(AbilityKey.DamageAmount)); return sb.toString(); } } diff --git a/forge-game/src/main/java/forge/game/trigger/TriggerDamagePreventedOnce.java b/forge-game/src/main/java/forge/game/trigger/TriggerDamagePreventedOnce.java index 444978bcbda..72383a0720a 100644 --- a/forge-game/src/main/java/forge/game/trigger/TriggerDamagePreventedOnce.java +++ b/forge-game/src/main/java/forge/game/trigger/TriggerDamagePreventedOnce.java @@ -21,6 +21,7 @@ import forge.game.ability.AbilityKey; import forge.game.card.Card; import forge.game.spellability.SpellAbility; import forge.util.Expressions; +import forge.util.Localizer; import java.util.Map; @@ -104,8 +105,8 @@ public class TriggerDamagePreventedOnce extends Trigger { @Override public String getImportantStackObjects(SpellAbility sa) { StringBuilder sb = new StringBuilder(); - sb.append("Damage Target: ").append(sa.getTriggeringObject(AbilityKey.Target)).append(", "); - sb.append("Amount: ").append(sa.getTriggeringObject(AbilityKey.DamageAmount)); + sb.append(Localizer.getInstance().getMessage("lblDamageTarget")).append(": ").append(sa.getTriggeringObject(AbilityKey.Target)).append(", "); + sb.append(Localizer.getInstance().getMessage("lblAmount")).append(": ").append(sa.getTriggeringObject(AbilityKey.DamageAmount)); return sb.toString(); } } diff --git a/forge-game/src/main/java/forge/game/trigger/TriggerDestroyed.java b/forge-game/src/main/java/forge/game/trigger/TriggerDestroyed.java index 49e4e26c58f..369c7b7015d 100644 --- a/forge-game/src/main/java/forge/game/trigger/TriggerDestroyed.java +++ b/forge-game/src/main/java/forge/game/trigger/TriggerDestroyed.java @@ -22,6 +22,7 @@ import java.util.Map; import forge.game.ability.AbilityKey; import forge.game.card.Card; import forge.game.spellability.SpellAbility; +import forge.util.Localizer; /** *

@@ -75,8 +76,8 @@ public class TriggerDestroyed extends Trigger { @Override public String getImportantStackObjects(SpellAbility sa) { StringBuilder sb = new StringBuilder(); - sb.append("Destroyed: ").append(sa.getTriggeringObject(AbilityKey.Card)).append(", "); - sb.append("Destroyer: ").append(sa.getTriggeringObject(AbilityKey.Causer)); + sb.append(Localizer.getInstance().getMessage("lblDestroyed")).append(": ").append(sa.getTriggeringObject(AbilityKey.Card)).append(", "); + sb.append(Localizer.getInstance().getMessage("lblDestroyer")).append(": ").append(sa.getTriggeringObject(AbilityKey.Causer)); return sb.toString(); } } diff --git a/forge-game/src/main/java/forge/game/trigger/TriggerDevoured.java b/forge-game/src/main/java/forge/game/trigger/TriggerDevoured.java index 6e27f99f7f8..700e5c83167 100644 --- a/forge-game/src/main/java/forge/game/trigger/TriggerDevoured.java +++ b/forge-game/src/main/java/forge/game/trigger/TriggerDevoured.java @@ -20,6 +20,7 @@ package forge.game.trigger; import forge.game.ability.AbilityKey; import forge.game.card.Card; import forge.game.spellability.SpellAbility; +import forge.util.Localizer; import java.util.Map; @@ -70,7 +71,7 @@ public class TriggerDevoured extends Trigger { @Override public String getImportantStackObjects(SpellAbility sa) { StringBuilder sb = new StringBuilder(); - sb.append("Devoured: ").append(sa.getTriggeringObject(AbilityKey.Devoured)); + sb.append(Localizer.getInstance().getMessage("lblDevoured")).append(": ").append(sa.getTriggeringObject(AbilityKey.Devoured)); return sb.toString(); } } diff --git a/forge-game/src/main/java/forge/game/trigger/TriggerDiscarded.java b/forge-game/src/main/java/forge/game/trigger/TriggerDiscarded.java index 14a181b9510..ef604384410 100644 --- a/forge-game/src/main/java/forge/game/trigger/TriggerDiscarded.java +++ b/forge-game/src/main/java/forge/game/trigger/TriggerDiscarded.java @@ -20,6 +20,7 @@ package forge.game.trigger; import forge.game.ability.AbilityKey; import forge.game.card.Card; import forge.game.spellability.SpellAbility; +import forge.util.Localizer; import java.util.Map; @@ -95,8 +96,8 @@ public class TriggerDiscarded extends Trigger { @Override public String getImportantStackObjects(SpellAbility sa) { StringBuilder sb = new StringBuilder(); - sb.append("Discarded: ").append(sa.getTriggeringObject(AbilityKey.Card)).append(", "); - sb.append("Cause: ").append(sa.getTriggeringObject(AbilityKey.Cause)); + sb.append(Localizer.getInstance().getMessage("lblDiscarded")).append(": ").append(sa.getTriggeringObject(AbilityKey.Card)).append(", "); + sb.append(Localizer.getInstance().getMessage("lblCause")).append(": ").append(sa.getTriggeringObject(AbilityKey.Cause)); return sb.toString(); } } diff --git a/forge-game/src/main/java/forge/game/trigger/TriggerDrawn.java b/forge-game/src/main/java/forge/game/trigger/TriggerDrawn.java index d5f3d06f176..eeb6afaff98 100644 --- a/forge-game/src/main/java/forge/game/trigger/TriggerDrawn.java +++ b/forge-game/src/main/java/forge/game/trigger/TriggerDrawn.java @@ -22,6 +22,7 @@ import forge.game.GameStage; import forge.game.ability.AbilityKey; import forge.game.card.Card; import forge.game.spellability.SpellAbility; +import forge.util.Localizer; import java.util.Map; @@ -88,7 +89,7 @@ public class TriggerDrawn extends Trigger { @Override public String getImportantStackObjects(SpellAbility sa) { StringBuilder sb = new StringBuilder(); - sb.append("Player: ").append(sa.getTriggeringObject(AbilityKey.Player)); + sb.append(Localizer.getInstance().getMessage("lblPlayer")).append(": ").append(sa.getTriggeringObject(AbilityKey.Player)); return sb.toString(); } } diff --git a/forge-game/src/main/java/forge/game/trigger/TriggerEvolved.java b/forge-game/src/main/java/forge/game/trigger/TriggerEvolved.java index afcf96c0e81..dd8d536257f 100644 --- a/forge-game/src/main/java/forge/game/trigger/TriggerEvolved.java +++ b/forge-game/src/main/java/forge/game/trigger/TriggerEvolved.java @@ -22,6 +22,7 @@ import java.util.Map; import forge.game.ability.AbilityKey; import forge.game.card.Card; import forge.game.spellability.SpellAbility; +import forge.util.Localizer; /** *

@@ -69,7 +70,7 @@ public class TriggerEvolved extends Trigger { @Override public String getImportantStackObjects(SpellAbility sa) { StringBuilder sb = new StringBuilder(); - sb.append("Evolved: ").append(sa.getTriggeringObject(AbilityKey.Card)); + sb.append(Localizer.getInstance().getMessage("lblEvolved")).append(": ").append(sa.getTriggeringObject(AbilityKey.Card)); return sb.toString(); } } diff --git a/forge-game/src/main/java/forge/game/trigger/TriggerExerted.java b/forge-game/src/main/java/forge/game/trigger/TriggerExerted.java index 4cc5d65f7e9..d17a504b2fc 100644 --- a/forge-game/src/main/java/forge/game/trigger/TriggerExerted.java +++ b/forge-game/src/main/java/forge/game/trigger/TriggerExerted.java @@ -3,6 +3,7 @@ package forge.game.trigger; import forge.game.ability.AbilityKey; import forge.game.card.Card; import forge.game.spellability.SpellAbility; +import forge.util.Localizer; import java.util.HashMap; import java.util.Map; @@ -39,7 +40,7 @@ public class TriggerExerted extends Trigger { @Override public String getImportantStackObjects(SpellAbility sa) { StringBuilder sb = new StringBuilder(); - sb.append("Exerted: ").append(sa.getTriggeringObject(AbilityKey.Card)); + sb.append(Localizer.getInstance().getMessage("lblExerted")).append(": ").append(sa.getTriggeringObject(AbilityKey.Card)); return sb.toString(); } } diff --git a/forge-game/src/main/java/forge/game/trigger/TriggerExiled.java b/forge-game/src/main/java/forge/game/trigger/TriggerExiled.java index 616bf8a4c7f..107126c2098 100644 --- a/forge-game/src/main/java/forge/game/trigger/TriggerExiled.java +++ b/forge-game/src/main/java/forge/game/trigger/TriggerExiled.java @@ -24,6 +24,7 @@ import forge.game.spellability.SpellAbility; import java.util.Map; +import forge.util.Localizer; import org.apache.commons.lang3.ArrayUtils; /** @@ -104,7 +105,7 @@ public class TriggerExiled extends Trigger { @Override public String getImportantStackObjects(SpellAbility sa) { StringBuilder sb = new StringBuilder(); - sb.append("Exiled: ").append(sa.getTriggeringObject(AbilityKey.Card)); + sb.append(Localizer.getInstance().getMessage("lblExiled")).append(": ").append(sa.getTriggeringObject(AbilityKey.Card)); return sb.toString(); } diff --git a/forge-game/src/main/java/forge/game/trigger/TriggerExploited.java b/forge-game/src/main/java/forge/game/trigger/TriggerExploited.java index 475b4977056..509c1951a7e 100644 --- a/forge-game/src/main/java/forge/game/trigger/TriggerExploited.java +++ b/forge-game/src/main/java/forge/game/trigger/TriggerExploited.java @@ -20,6 +20,7 @@ package forge.game.trigger; import forge.game.ability.AbilityKey; import forge.game.card.Card; import forge.game.spellability.SpellAbility; +import forge.util.Localizer; import java.util.Map; @@ -81,8 +82,8 @@ public class TriggerExploited extends Trigger { @Override public String getImportantStackObjects(SpellAbility sa) { StringBuilder sb = new StringBuilder(); - sb.append("Exploited: ").append(sa.getTriggeringObject(AbilityKey.Exploited)).append(", "); - sb.append("Exploiter: ").append(sa.getTriggeringObject(AbilityKey.Card)); + sb.append(Localizer.getInstance().getMessage("lblExploited")).append(": ").append(sa.getTriggeringObject(AbilityKey.Exploited)).append(", "); + sb.append(Localizer.getInstance().getMessage("lblExploiter")).append(": ").append(sa.getTriggeringObject(AbilityKey.Card)); return sb.toString(); } } diff --git a/forge-game/src/main/java/forge/game/trigger/TriggerExplores.java b/forge-game/src/main/java/forge/game/trigger/TriggerExplores.java index f330ffeb0bb..90edb8c33c1 100644 --- a/forge-game/src/main/java/forge/game/trigger/TriggerExplores.java +++ b/forge-game/src/main/java/forge/game/trigger/TriggerExplores.java @@ -20,6 +20,7 @@ package forge.game.trigger; import forge.game.ability.AbilityKey; import forge.game.card.Card; import forge.game.spellability.SpellAbility; +import forge.util.Localizer; import java.util.Map; @@ -69,7 +70,7 @@ public class TriggerExplores extends Trigger { public String getImportantStackObjects(SpellAbility sa) { StringBuilder sb = new StringBuilder(); - sb.append("Explorer: ").append(sa.getTriggeringObject(AbilityKey.Explorer)); + sb.append(Localizer.getInstance().getMessage("lblExplorer")).append(": ").append(sa.getTriggeringObject(AbilityKey.Explorer)); return sb.toString(); } } diff --git a/forge-game/src/main/java/forge/game/trigger/TriggerFight.java b/forge-game/src/main/java/forge/game/trigger/TriggerFight.java index 1aa88c5732f..fbf2a764773 100644 --- a/forge-game/src/main/java/forge/game/trigger/TriggerFight.java +++ b/forge-game/src/main/java/forge/game/trigger/TriggerFight.java @@ -20,6 +20,7 @@ package forge.game.trigger; import forge.game.ability.AbilityKey; import forge.game.card.Card; import forge.game.spellability.SpellAbility; +import forge.util.Localizer; import java.util.Map; @@ -72,7 +73,7 @@ public class TriggerFight extends Trigger { @Override public String getImportantStackObjects(SpellAbility sa) { StringBuilder sb = new StringBuilder(); - sb.append("Fighter: ").append(sa.getTriggeringObject(AbilityKey.Fighter)); + sb.append(Localizer.getInstance().getMessage("lblFighter")).append(": ").append(sa.getTriggeringObject(AbilityKey.Fighter)); return sb.toString(); } } diff --git a/forge-game/src/main/java/forge/game/trigger/TriggerFlippedCoin.java b/forge-game/src/main/java/forge/game/trigger/TriggerFlippedCoin.java index 932354b241f..52c8e9798e5 100644 --- a/forge-game/src/main/java/forge/game/trigger/TriggerFlippedCoin.java +++ b/forge-game/src/main/java/forge/game/trigger/TriggerFlippedCoin.java @@ -20,6 +20,7 @@ package forge.game.trigger; import forge.game.ability.AbilityKey; import forge.game.card.Card; import forge.game.spellability.SpellAbility; +import forge.util.Localizer; import java.util.Map; @@ -79,7 +80,7 @@ public class TriggerFlippedCoin extends Trigger { @Override public String getImportantStackObjects(SpellAbility sa) { StringBuilder sb = new StringBuilder(); - sb.append("Player: ").append(sa.getTriggeringObject(AbilityKey.Player)); + sb.append(Localizer.getInstance().getMessage("lblPlayer")).append(": ").append(sa.getTriggeringObject(AbilityKey.Player)); return sb.toString(); } } diff --git a/forge-game/src/main/java/forge/game/trigger/TriggerInvestigated.java b/forge-game/src/main/java/forge/game/trigger/TriggerInvestigated.java index 155d0aacaa6..0ed0ab95e3d 100644 --- a/forge-game/src/main/java/forge/game/trigger/TriggerInvestigated.java +++ b/forge-game/src/main/java/forge/game/trigger/TriggerInvestigated.java @@ -21,6 +21,7 @@ import forge.game.ability.AbilityKey; import forge.game.card.Card; import forge.game.player.Player; import forge.game.spellability.SpellAbility; +import forge.util.Localizer; import java.util.Map; @@ -53,7 +54,7 @@ public class TriggerInvestigated extends Trigger { @Override public String getImportantStackObjects(SpellAbility sa) { StringBuilder sb = new StringBuilder(); - sb.append("Player: ").append(sa.getTriggeringObject(AbilityKey.Player)); + sb.append(Localizer.getInstance().getMessage("lblPlayer")).append(": ").append(sa.getTriggeringObject(AbilityKey.Player)); return sb.toString(); } diff --git a/forge-game/src/main/java/forge/game/trigger/TriggerLandPlayed.java b/forge-game/src/main/java/forge/game/trigger/TriggerLandPlayed.java index ed6ceb30dbc..cb8b32fd694 100644 --- a/forge-game/src/main/java/forge/game/trigger/TriggerLandPlayed.java +++ b/forge-game/src/main/java/forge/game/trigger/TriggerLandPlayed.java @@ -20,6 +20,7 @@ package forge.game.trigger; import forge.game.ability.AbilityKey; import forge.game.card.Card; import forge.game.spellability.SpellAbility; +import forge.util.Localizer; import java.util.Map; @@ -58,7 +59,7 @@ public class TriggerLandPlayed extends Trigger { @Override public String getImportantStackObjects(SpellAbility sa) { StringBuilder sb = new StringBuilder(); - sb.append("Land played: ").append(sa.getTriggeringObject(AbilityKey.Card)); + sb.append(Localizer.getInstance().getMessage("lblLandPlayed")).append(": ").append(sa.getTriggeringObject(AbilityKey.Card)); return sb.toString(); } diff --git a/forge-game/src/main/java/forge/game/trigger/TriggerLifeGained.java b/forge-game/src/main/java/forge/game/trigger/TriggerLifeGained.java index fe92c615a17..17e934eef05 100644 --- a/forge-game/src/main/java/forge/game/trigger/TriggerLifeGained.java +++ b/forge-game/src/main/java/forge/game/trigger/TriggerLifeGained.java @@ -20,6 +20,7 @@ package forge.game.trigger; import forge.game.ability.AbilityKey; import forge.game.card.Card; import forge.game.spellability.SpellAbility; +import forge.util.Localizer; import java.util.Map; @@ -81,8 +82,8 @@ public class TriggerLifeGained extends Trigger { @Override public String getImportantStackObjects(SpellAbility sa) { StringBuilder sb = new StringBuilder(); - sb.append("Player: ").append(sa.getTriggeringObject(AbilityKey.Player)).append(", "); - sb.append("Gained Amount: ").append(sa.getTriggeringObject(AbilityKey.LifeAmount)); + sb.append(Localizer.getInstance().getMessage("lblPlayer")).append(": ").append(sa.getTriggeringObject(AbilityKey.Player)).append(", "); + sb.append(Localizer.getInstance().getMessage("lblGainedAmount")).append(": ").append(sa.getTriggeringObject(AbilityKey.LifeAmount)); return sb.toString(); } } diff --git a/forge-game/src/main/java/forge/game/trigger/TriggerLifeLost.java b/forge-game/src/main/java/forge/game/trigger/TriggerLifeLost.java index 6a4376b6d1e..cb42ed21581 100644 --- a/forge-game/src/main/java/forge/game/trigger/TriggerLifeLost.java +++ b/forge-game/src/main/java/forge/game/trigger/TriggerLifeLost.java @@ -22,6 +22,7 @@ import java.util.Map; import forge.game.ability.AbilityKey; import forge.game.card.Card; import forge.game.spellability.SpellAbility; +import forge.util.Localizer; /** *

@@ -78,8 +79,8 @@ public class TriggerLifeLost extends Trigger { @Override public String getImportantStackObjects(SpellAbility sa) { StringBuilder sb = new StringBuilder(); - sb.append("Player: ").append(sa.getTriggeringObject(AbilityKey.Player)).append(", "); - sb.append("Lost Amount: ").append(sa.getTriggeringObject(AbilityKey.LifeAmount)); + sb.append(Localizer.getInstance().getMessage("lblPlayer")).append(": ").append(sa.getTriggeringObject(AbilityKey.Player)).append(", "); + sb.append(Localizer.getInstance().getMessage("lblLostAmount")).append(": ").append(sa.getTriggeringObject(AbilityKey.LifeAmount)); return sb.toString(); } } diff --git a/forge-game/src/main/java/forge/game/trigger/TriggerLosesGame.java b/forge-game/src/main/java/forge/game/trigger/TriggerLosesGame.java index 2e2d0ebf58e..9b9c3df538f 100644 --- a/forge-game/src/main/java/forge/game/trigger/TriggerLosesGame.java +++ b/forge-game/src/main/java/forge/game/trigger/TriggerLosesGame.java @@ -3,6 +3,7 @@ package forge.game.trigger; import forge.game.ability.AbilityKey; import forge.game.card.Card; import forge.game.spellability.SpellAbility; +import forge.util.Localizer; import java.util.Map; @@ -48,7 +49,7 @@ public class TriggerLosesGame extends Trigger { @Override public String getImportantStackObjects(SpellAbility sa) { StringBuilder sb = new StringBuilder(); - sb.append("Player: ").append(sa.getTriggeringObject(AbilityKey.Player)); + sb.append(Localizer.getInstance().getMessage("lblPlayer")).append(": ").append(sa.getTriggeringObject(AbilityKey.Player)); return sb.toString(); } } diff --git a/forge-game/src/main/java/forge/game/trigger/TriggerPayCumulativeUpkeep.java b/forge-game/src/main/java/forge/game/trigger/TriggerPayCumulativeUpkeep.java index 2c48b559a73..f3789b45f1b 100644 --- a/forge-game/src/main/java/forge/game/trigger/TriggerPayCumulativeUpkeep.java +++ b/forge-game/src/main/java/forge/game/trigger/TriggerPayCumulativeUpkeep.java @@ -20,6 +20,7 @@ package forge.game.trigger; import forge.game.ability.AbilityKey; import forge.game.card.Card; import forge.game.spellability.SpellAbility; +import forge.util.Localizer; import java.util.Map; @@ -79,7 +80,7 @@ public class TriggerPayCumulativeUpkeep extends Trigger { @Override public String getImportantStackObjects(SpellAbility sa) { StringBuilder sb = new StringBuilder(); - sb.append("Mana: ").append(sa.getTriggeringObject(AbilityKey.PayingMana)); + sb.append(Localizer.getInstance().getMessage("lblMana")).append(": ").append(sa.getTriggeringObject(AbilityKey.PayingMana)); return sb.toString(); } } diff --git a/forge-game/src/main/java/forge/game/trigger/TriggerPayLife.java b/forge-game/src/main/java/forge/game/trigger/TriggerPayLife.java index 50bc7d21eea..dec7ee4f3be 100644 --- a/forge-game/src/main/java/forge/game/trigger/TriggerPayLife.java +++ b/forge-game/src/main/java/forge/game/trigger/TriggerPayLife.java @@ -20,6 +20,7 @@ package forge.game.trigger; import forge.game.ability.AbilityKey; import forge.game.card.Card; import forge.game.spellability.SpellAbility; +import forge.util.Localizer; import java.util.Map; @@ -68,8 +69,8 @@ public class TriggerPayLife extends Trigger { @Override public String getImportantStackObjects(SpellAbility sa) { StringBuilder sb = new StringBuilder(); - sb.append("Player: ").append(sa.getTriggeringObject(AbilityKey.Player)).append(", "); - sb.append("paid Amount: ").append(sa.getTriggeringObject(AbilityKey.LifeAmount)); + sb.append(Localizer.getInstance().getMessage("lblPlayer")).append(": ").append(sa.getTriggeringObject(AbilityKey.Player)).append(", "); + sb.append(Localizer.getInstance().getMessage("lblPaidAmount")).append(": ").append(sa.getTriggeringObject(AbilityKey.LifeAmount)); return sb.toString(); } } diff --git a/forge-game/src/main/java/forge/game/trigger/TriggerPhaseIn.java b/forge-game/src/main/java/forge/game/trigger/TriggerPhaseIn.java index 5368c42bd2f..3946cb5eba6 100644 --- a/forge-game/src/main/java/forge/game/trigger/TriggerPhaseIn.java +++ b/forge-game/src/main/java/forge/game/trigger/TriggerPhaseIn.java @@ -3,6 +3,7 @@ package forge.game.trigger; import forge.game.ability.AbilityKey; import forge.game.card.Card; import forge.game.spellability.SpellAbility; +import forge.util.Localizer; import java.util.Map; @@ -35,7 +36,7 @@ public class TriggerPhaseIn extends Trigger { @Override public String getImportantStackObjects(SpellAbility sa) { StringBuilder sb = new StringBuilder(); - sb.append("Phased In: ").append(sa.getTriggeringObject(AbilityKey.Card)); + sb.append(Localizer.getInstance().getMessage("lblPhasedIn")).append(": ").append(sa.getTriggeringObject(AbilityKey.Card)); return sb.toString(); } } diff --git a/forge-game/src/main/java/forge/game/trigger/TriggerPhaseOut.java b/forge-game/src/main/java/forge/game/trigger/TriggerPhaseOut.java index fbc582cae21..bd9d0469d6f 100644 --- a/forge-game/src/main/java/forge/game/trigger/TriggerPhaseOut.java +++ b/forge-game/src/main/java/forge/game/trigger/TriggerPhaseOut.java @@ -3,6 +3,7 @@ package forge.game.trigger; import forge.game.ability.AbilityKey; import forge.game.card.Card; import forge.game.spellability.SpellAbility; +import forge.util.Localizer; import java.util.Map; @@ -43,7 +44,7 @@ public class TriggerPhaseOut extends Trigger { @Override public String getImportantStackObjects(SpellAbility sa) { StringBuilder sb = new StringBuilder(); - sb.append("Phased Out: ").append(sa.getTriggeringObject(AbilityKey.Card)); + sb.append(Localizer.getInstance().getMessage("lblPhasedOut")).append(": ").append(sa.getTriggeringObject(AbilityKey.Card)); return sb.toString(); } } diff --git a/forge-game/src/main/java/forge/game/trigger/TriggerPlanarDice.java b/forge-game/src/main/java/forge/game/trigger/TriggerPlanarDice.java index e811f1b2761..99c63e0ff32 100644 --- a/forge-game/src/main/java/forge/game/trigger/TriggerPlanarDice.java +++ b/forge-game/src/main/java/forge/game/trigger/TriggerPlanarDice.java @@ -4,6 +4,7 @@ import forge.game.PlanarDice; import forge.game.ability.AbilityKey; import forge.game.card.Card; import forge.game.spellability.SpellAbility; +import forge.util.Localizer; import java.util.Map; @@ -62,7 +63,7 @@ public class TriggerPlanarDice extends Trigger { @Override public String getImportantStackObjects(SpellAbility sa) { StringBuilder sb = new StringBuilder(); - sb.append("Roller: ").append(sa.getTriggeringObject(AbilityKey.Player)); + sb.append(Localizer.getInstance().getMessage("lblRoller")).append(": ").append(sa.getTriggeringObject(AbilityKey.Player)); return sb.toString(); } } diff --git a/forge-game/src/main/java/forge/game/trigger/TriggerPlaneswalkedFrom.java b/forge-game/src/main/java/forge/game/trigger/TriggerPlaneswalkedFrom.java index b7aedd7c128..8a174b04fca 100644 --- a/forge-game/src/main/java/forge/game/trigger/TriggerPlaneswalkedFrom.java +++ b/forge-game/src/main/java/forge/game/trigger/TriggerPlaneswalkedFrom.java @@ -4,6 +4,7 @@ import forge.game.ability.AbilityKey; import forge.game.card.Card; import forge.game.card.CardCollection; import forge.game.spellability.SpellAbility; +import forge.util.Localizer; import java.util.Map; @@ -59,7 +60,7 @@ public class TriggerPlaneswalkedFrom extends Trigger { @Override public String getImportantStackObjects(SpellAbility sa) { StringBuilder sb = new StringBuilder(); - sb.append("Planeswalked From: ").append(sa.getTriggeringObject(AbilityKey.Cards)); + sb.append(Localizer.getInstance().getMessage("lblPlaneswalkedFrom")).append(": ").append(sa.getTriggeringObject(AbilityKey.Cards)); return sb.toString(); } diff --git a/forge-game/src/main/java/forge/game/trigger/TriggerPlaneswalkedTo.java b/forge-game/src/main/java/forge/game/trigger/TriggerPlaneswalkedTo.java index f927242dd71..b12d1cee14a 100644 --- a/forge-game/src/main/java/forge/game/trigger/TriggerPlaneswalkedTo.java +++ b/forge-game/src/main/java/forge/game/trigger/TriggerPlaneswalkedTo.java @@ -3,6 +3,7 @@ package forge.game.trigger; import forge.game.ability.AbilityKey; import forge.game.card.Card; import forge.game.spellability.SpellAbility; +import forge.util.Localizer; import java.util.Map; @@ -59,7 +60,7 @@ public class TriggerPlaneswalkedTo extends Trigger { @Override public String getImportantStackObjects(SpellAbility sa) { StringBuilder sb = new StringBuilder(); - sb.append("Planeswalked To: ").append(sa.getTriggeringObject(AbilityKey.Cards)); + sb.append(Localizer.getInstance().getMessage("lblPlaneswalkedTo")).append(": ").append(sa.getTriggeringObject(AbilityKey.Cards)); return sb.toString(); } } diff --git a/forge-game/src/main/java/forge/game/trigger/TriggerRegenerated.java b/forge-game/src/main/java/forge/game/trigger/TriggerRegenerated.java index 2d07c738ed8..11a965aaaf0 100644 --- a/forge-game/src/main/java/forge/game/trigger/TriggerRegenerated.java +++ b/forge-game/src/main/java/forge/game/trigger/TriggerRegenerated.java @@ -22,6 +22,7 @@ import java.util.Map; import forge.game.ability.AbilityKey; import forge.game.card.Card; import forge.game.spellability.SpellAbility; +import forge.util.Localizer; /** *

@@ -75,7 +76,7 @@ public class TriggerRegenerated extends Trigger { @Override public String getImportantStackObjects(SpellAbility sa) { StringBuilder sb = new StringBuilder(); - sb.append("Regenerated: ").append(sa.getTriggeringObject(AbilityKey.Card)); + sb.append(Localizer.getInstance().getMessage("lblRegenerated")).append(": ").append(sa.getTriggeringObject(AbilityKey.Card)); //sb.append("Destroyer: ").append(sa.getTriggeringObject("Causer")); return sb.toString(); } diff --git a/forge-game/src/main/java/forge/game/trigger/TriggerRevealed.java b/forge-game/src/main/java/forge/game/trigger/TriggerRevealed.java index 21445dfccc2..3d11d6934ce 100644 --- a/forge-game/src/main/java/forge/game/trigger/TriggerRevealed.java +++ b/forge-game/src/main/java/forge/game/trigger/TriggerRevealed.java @@ -5,6 +5,7 @@ import java.util.Map; import forge.game.ability.AbilityKey; import forge.game.card.Card; import forge.game.spellability.SpellAbility; +import forge.util.Localizer; public class TriggerRevealed extends Trigger { @@ -37,7 +38,7 @@ public class TriggerRevealed extends Trigger { @Override public String getImportantStackObjects(SpellAbility sa) { StringBuilder sb = new StringBuilder(); - sb.append("Revealed: ").append(sa.getTriggeringObject(AbilityKey.Card)); + sb.append(Localizer.getInstance().getMessage("lblRevealed")).append(": ").append(sa.getTriggeringObject(AbilityKey.Card)); return sb.toString(); } diff --git a/forge-game/src/main/java/forge/game/trigger/TriggerSacrificed.java b/forge-game/src/main/java/forge/game/trigger/TriggerSacrificed.java index 42209562b2a..79b4436c909 100644 --- a/forge-game/src/main/java/forge/game/trigger/TriggerSacrificed.java +++ b/forge-game/src/main/java/forge/game/trigger/TriggerSacrificed.java @@ -23,6 +23,7 @@ import forge.game.cost.IndividualCostPaymentInstance; import forge.game.player.Player; import forge.game.spellability.SpellAbility; import forge.game.zone.CostPaymentStack; +import forge.util.Localizer; import java.util.Map; @@ -135,7 +136,7 @@ public class TriggerSacrificed extends Trigger { @Override public String getImportantStackObjects(SpellAbility sa) { StringBuilder sb = new StringBuilder(); - sb.append("Sacrificed: ").append(sa.getTriggeringObject(AbilityKey.Card)); + sb.append(Localizer.getInstance().getMessage("lblSacrificed")).append(": ").append(sa.getTriggeringObject(AbilityKey.Card)); return sb.toString(); } diff --git a/forge-game/src/main/java/forge/game/trigger/TriggerScry.java b/forge-game/src/main/java/forge/game/trigger/TriggerScry.java index 67324ace54f..47cb3c7335e 100644 --- a/forge-game/src/main/java/forge/game/trigger/TriggerScry.java +++ b/forge-game/src/main/java/forge/game/trigger/TriggerScry.java @@ -20,6 +20,7 @@ package forge.game.trigger; import forge.game.ability.AbilityKey; import forge.game.card.Card; import forge.game.spellability.SpellAbility; +import forge.util.Localizer; import java.util.Map; @@ -71,7 +72,7 @@ public class TriggerScry extends Trigger { @Override public String getImportantStackObjects(SpellAbility sa) { StringBuilder sb = new StringBuilder(); - sb.append("Scryer: ").append(sa.getTriggeringObject(AbilityKey.Player)); + sb.append(Localizer.getInstance().getMessage("lblScryer")).append(": ").append(sa.getTriggeringObject(AbilityKey.Player)); return sb.toString(); } } diff --git a/forge-game/src/main/java/forge/game/trigger/TriggerSearchedLibrary.java b/forge-game/src/main/java/forge/game/trigger/TriggerSearchedLibrary.java index b4a197155b9..56b8f91b65a 100644 --- a/forge-game/src/main/java/forge/game/trigger/TriggerSearchedLibrary.java +++ b/forge-game/src/main/java/forge/game/trigger/TriggerSearchedLibrary.java @@ -24,6 +24,7 @@ import forge.game.ability.AbilityKey; import forge.game.card.Card; import forge.game.player.Player; import forge.game.spellability.SpellAbility; +import forge.util.Localizer; /** *

@@ -82,7 +83,7 @@ public class TriggerSearchedLibrary extends Trigger { @Override public String getImportantStackObjects(SpellAbility sa) { StringBuilder sb = new StringBuilder(); - sb.append("Searcher: ").append(sa.getTriggeringObject(AbilityKey.Player)); + sb.append(Localizer.getInstance().getMessage("lblSearcher")).append(": ").append(sa.getTriggeringObject(AbilityKey.Player)); return sb.toString(); } } diff --git a/forge-game/src/main/java/forge/game/trigger/TriggerShuffled.java b/forge-game/src/main/java/forge/game/trigger/TriggerShuffled.java index 82f1e6d01be..a211eba1438 100644 --- a/forge-game/src/main/java/forge/game/trigger/TriggerShuffled.java +++ b/forge-game/src/main/java/forge/game/trigger/TriggerShuffled.java @@ -20,6 +20,7 @@ package forge.game.trigger; import forge.game.ability.AbilityKey; import forge.game.card.Card; import forge.game.spellability.SpellAbility; +import forge.util.Localizer; import java.util.Map; @@ -83,7 +84,7 @@ public class TriggerShuffled extends Trigger { @Override public String getImportantStackObjects(SpellAbility sa) { StringBuilder sb = new StringBuilder(); - sb.append("Shuffler: ").append(sa.getTriggeringObject(AbilityKey.Player)); + sb.append(Localizer.getInstance().getMessage("lblShuffler")).append(": ").append(sa.getTriggeringObject(AbilityKey.Player)); return sb.toString(); } } diff --git a/forge-game/src/main/java/forge/game/trigger/TriggerSpellAbilityCast.java b/forge-game/src/main/java/forge/game/trigger/TriggerSpellAbilityCast.java index e13cab7df14..6708ee73337 100644 --- a/forge-game/src/main/java/forge/game/trigger/TriggerSpellAbilityCast.java +++ b/forge-game/src/main/java/forge/game/trigger/TriggerSpellAbilityCast.java @@ -38,6 +38,7 @@ import forge.game.spellability.SpellAbilityStackInstance; import forge.game.spellability.TargetChoices; import forge.game.zone.ZoneType; import forge.util.Expressions; +import forge.util.Localizer; /** *

@@ -284,9 +285,9 @@ public class TriggerSpellAbilityCast extends Trigger { @Override public String getImportantStackObjects(SpellAbility sa) { StringBuilder sb = new StringBuilder(); - sb.append("Card: ").append(sa.getTriggeringObject(AbilityKey.Card)).append(", "); - sb.append("Activator: ").append(sa.getTriggeringObject(AbilityKey.Activator)).append(", "); - sb.append("SpellAbility: ").append(sa.getTriggeringObject(AbilityKey.SpellAbility)); + sb.append(Localizer.getInstance().getMessage("lblCard")).append(": ").append(sa.getTriggeringObject(AbilityKey.Card)).append(", "); + sb.append(Localizer.getInstance().getMessage("lblActivator")).append(": ").append(sa.getTriggeringObject(AbilityKey.Activator)).append(", "); + sb.append(Localizer.getInstance().getMessage("lblSpellAbility")).append(": ").append(sa.getTriggeringObject(AbilityKey.SpellAbility)); return sb.toString(); } } diff --git a/forge-game/src/main/java/forge/game/trigger/TriggerSpellAbilityCopy.java b/forge-game/src/main/java/forge/game/trigger/TriggerSpellAbilityCopy.java index d21383e792b..ec00915227f 100644 --- a/forge-game/src/main/java/forge/game/trigger/TriggerSpellAbilityCopy.java +++ b/forge-game/src/main/java/forge/game/trigger/TriggerSpellAbilityCopy.java @@ -23,6 +23,7 @@ import forge.game.ability.AbilityKey; import forge.game.card.Card; import forge.game.spellability.SpellAbility; import forge.game.spellability.SpellAbilityStackInstance; +import forge.util.Localizer; /** *

@@ -102,9 +103,9 @@ public class TriggerSpellAbilityCopy extends Trigger { @Override public String getImportantStackObjects(SpellAbility sa) { StringBuilder sb = new StringBuilder(); - sb.append("Card: ").append(sa.getTriggeringObject(AbilityKey.Card)).append(", "); - sb.append("Activator: ").append(sa.getTriggeringObject(AbilityKey.Activator)).append(", "); - sb.append("SpellAbility: ").append(sa.getTriggeringObject(AbilityKey.SpellAbility)); + sb.append(Localizer.getInstance().getMessage("lblCard")).append(": ").append(sa.getTriggeringObject(AbilityKey.Card)).append(", "); + sb.append(Localizer.getInstance().getMessage("lblActivator")).append(": ").append(sa.getTriggeringObject(AbilityKey.Activator)).append(", "); + sb.append(Localizer.getInstance().getMessage("lblSpellAbility")).append(": ").append(sa.getTriggeringObject(AbilityKey.SpellAbility)); return sb.toString(); } } diff --git a/forge-game/src/main/java/forge/game/trigger/TriggerSurveil.java b/forge-game/src/main/java/forge/game/trigger/TriggerSurveil.java index 91170953511..cb5d6f1afea 100644 --- a/forge-game/src/main/java/forge/game/trigger/TriggerSurveil.java +++ b/forge-game/src/main/java/forge/game/trigger/TriggerSurveil.java @@ -21,6 +21,7 @@ import forge.game.ability.AbilityKey; import forge.game.card.Card; import forge.game.player.Player; import forge.game.spellability.SpellAbility; +import forge.util.Localizer; import java.util.Map; @@ -49,7 +50,7 @@ public class TriggerSurveil extends Trigger { @Override public String getImportantStackObjects(SpellAbility sa) { StringBuilder sb = new StringBuilder(); - sb.append("Player: ").append(sa.getTriggeringObject(AbilityKey.Player)); + sb.append(Localizer.getInstance().getMessage("lblPlayer")).append(": ").append(sa.getTriggeringObject(AbilityKey.Player)); return sb.toString(); } diff --git a/forge-game/src/main/java/forge/game/trigger/TriggerTaps.java b/forge-game/src/main/java/forge/game/trigger/TriggerTaps.java index faee4b2ee36..23a30a55195 100644 --- a/forge-game/src/main/java/forge/game/trigger/TriggerTaps.java +++ b/forge-game/src/main/java/forge/game/trigger/TriggerTaps.java @@ -20,6 +20,7 @@ package forge.game.trigger; import forge.game.ability.AbilityKey; import forge.game.card.Card; import forge.game.spellability.SpellAbility; +import forge.util.Localizer; import java.util.Map; @@ -85,7 +86,7 @@ public class TriggerTaps extends Trigger { @Override public String getImportantStackObjects(SpellAbility sa) { StringBuilder sb = new StringBuilder(); - sb.append("Tapped: ").append(sa.getTriggeringObject(AbilityKey.Card)); + sb.append(Localizer.getInstance().getMessage("lblTapped")).append(": ").append(sa.getTriggeringObject(AbilityKey.Card)); return sb.toString(); } diff --git a/forge-game/src/main/java/forge/game/trigger/TriggerTapsForMana.java b/forge-game/src/main/java/forge/game/trigger/TriggerTapsForMana.java index 78faa4bfd52..de96aa18d8b 100644 --- a/forge-game/src/main/java/forge/game/trigger/TriggerTapsForMana.java +++ b/forge-game/src/main/java/forge/game/trigger/TriggerTapsForMana.java @@ -22,6 +22,7 @@ import forge.game.ability.AbilityKey; import forge.game.card.Card; import forge.game.player.Player; import forge.game.spellability.SpellAbility; +import forge.util.Localizer; import java.util.Map; @@ -114,8 +115,8 @@ public class TriggerTapsForMana extends Trigger { @Override public String getImportantStackObjects(SpellAbility sa) { StringBuilder sb = new StringBuilder(); - sb.append("Tapped for Mana: ").append(sa.getTriggeringObject(AbilityKey.Card)); - sb.append("Produced: ").append(sa.getTriggeringObject(AbilityKey.Produced)); + sb.append(Localizer.getInstance().getMessage("lblTappedForMana")).append(": ").append(sa.getTriggeringObject(AbilityKey.Card)); + sb.append(Localizer.getInstance().getMessage("lblProduced")).append(": ").append(sa.getTriggeringObject(AbilityKey.Produced)); return sb.toString(); } diff --git a/forge-game/src/main/java/forge/game/trigger/TriggerTransformed.java b/forge-game/src/main/java/forge/game/trigger/TriggerTransformed.java index 43f032fd99a..36f0429f32c 100644 --- a/forge-game/src/main/java/forge/game/trigger/TriggerTransformed.java +++ b/forge-game/src/main/java/forge/game/trigger/TriggerTransformed.java @@ -20,6 +20,7 @@ package forge.game.trigger; import forge.game.ability.AbilityKey; import forge.game.card.Card; import forge.game.spellability.SpellAbility; +import forge.util.Localizer; import java.util.Map; @@ -65,7 +66,7 @@ public class TriggerTransformed extends Trigger { @Override public String getImportantStackObjects(SpellAbility sa) { StringBuilder sb = new StringBuilder(); - sb.append("Transformed: ").append(sa.getTriggeringObject(AbilityKey.Transformer)); + sb.append(Localizer.getInstance().getMessage("lblTransformed")).append(": ").append(sa.getTriggeringObject(AbilityKey.Transformer)); return sb.toString(); } diff --git a/forge-game/src/main/java/forge/game/trigger/TriggerTurnBegin.java b/forge-game/src/main/java/forge/game/trigger/TriggerTurnBegin.java index dba63859d73..e6bd53b8b28 100644 --- a/forge-game/src/main/java/forge/game/trigger/TriggerTurnBegin.java +++ b/forge-game/src/main/java/forge/game/trigger/TriggerTurnBegin.java @@ -3,6 +3,7 @@ package forge.game.trigger; import forge.game.ability.AbilityKey; import forge.game.card.Card; import forge.game.spellability.SpellAbility; +import forge.util.Localizer; import java.util.Map; @@ -29,7 +30,7 @@ public class TriggerTurnBegin extends Trigger { @Override public String getImportantStackObjects(SpellAbility sa) { StringBuilder sb = new StringBuilder(); - sb.append("Player: ").append(sa.getTriggeringObject(AbilityKey.Player)); + sb.append(Localizer.getInstance().getMessage("lblPlayer")).append(": ").append(sa.getTriggeringObject(AbilityKey.Player)); return sb.toString(); } } diff --git a/forge-game/src/main/java/forge/game/trigger/TriggerTurnFaceUp.java b/forge-game/src/main/java/forge/game/trigger/TriggerTurnFaceUp.java index c1b96e0e102..f27a472667c 100644 --- a/forge-game/src/main/java/forge/game/trigger/TriggerTurnFaceUp.java +++ b/forge-game/src/main/java/forge/game/trigger/TriggerTurnFaceUp.java @@ -20,6 +20,7 @@ package forge.game.trigger; import forge.game.ability.AbilityKey; import forge.game.card.Card; import forge.game.spellability.SpellAbility; +import forge.util.Localizer; import java.util.Map; @@ -70,7 +71,7 @@ public class TriggerTurnFaceUp extends Trigger { @Override public String getImportantStackObjects(SpellAbility sa) { StringBuilder sb = new StringBuilder(); - sb.append("Turn Face up: ").append(sa.getTriggeringObject(AbilityKey.Card)); + sb.append(Localizer.getInstance().getMessage("lblTurnFaceUp")).append(": ").append(sa.getTriggeringObject(AbilityKey.Card)); return sb.toString(); } diff --git a/forge-game/src/main/java/forge/game/trigger/TriggerUnattach.java b/forge-game/src/main/java/forge/game/trigger/TriggerUnattach.java index d40179f1de6..18dbaeb6c7b 100644 --- a/forge-game/src/main/java/forge/game/trigger/TriggerUnattach.java +++ b/forge-game/src/main/java/forge/game/trigger/TriggerUnattach.java @@ -21,6 +21,7 @@ import forge.game.GameEntity; import forge.game.ability.AbilityKey; import forge.game.card.Card; import forge.game.spellability.SpellAbility; +import forge.util.Localizer; import java.util.Map; @@ -82,8 +83,8 @@ public class TriggerUnattach extends Trigger { @Override public String getImportantStackObjects(SpellAbility sa) { StringBuilder sb = new StringBuilder(); - sb.append("Object: ").append(sa.getTriggeringObject(AbilityKey.Object)).append(", "); - sb.append("Attachment: ").append(sa.getTriggeringObject(AbilityKey.Attach)); + sb.append(Localizer.getInstance().getMessage("lblObject")).append(": ").append(sa.getTriggeringObject(AbilityKey.Object)).append(", "); + sb.append(Localizer.getInstance().getMessage("lblAttachment")).append(": ").append(sa.getTriggeringObject(AbilityKey.Attach)); return sb.toString(); } diff --git a/forge-game/src/main/java/forge/game/trigger/TriggerUntaps.java b/forge-game/src/main/java/forge/game/trigger/TriggerUntaps.java index 730d805c656..a01a3f8d46d 100644 --- a/forge-game/src/main/java/forge/game/trigger/TriggerUntaps.java +++ b/forge-game/src/main/java/forge/game/trigger/TriggerUntaps.java @@ -20,6 +20,7 @@ package forge.game.trigger; import forge.game.ability.AbilityKey; import forge.game.card.Card; import forge.game.spellability.SpellAbility; +import forge.util.Localizer; import java.util.Map; @@ -74,7 +75,7 @@ public class TriggerUntaps extends Trigger { @Override public String getImportantStackObjects(SpellAbility sa) { StringBuilder sb = new StringBuilder(); - sb.append("Untapped: ").append(sa.getTriggeringObject(AbilityKey.Card)); + sb.append(Localizer.getInstance().getMessage("lblUntapped")).append(": ").append(sa.getTriggeringObject(AbilityKey.Card)); return sb.toString(); } } diff --git a/forge-game/src/main/java/forge/game/trigger/TriggerVote.java b/forge-game/src/main/java/forge/game/trigger/TriggerVote.java index 169a5f39212..1a21bf5aa75 100644 --- a/forge-game/src/main/java/forge/game/trigger/TriggerVote.java +++ b/forge-game/src/main/java/forge/game/trigger/TriggerVote.java @@ -26,6 +26,7 @@ import forge.game.ability.AbilityKey; import forge.game.card.Card; import forge.game.player.Player; import forge.game.spellability.SpellAbility; +import forge.util.Localizer; import forge.util.collect.FCollection; /** @@ -77,7 +78,7 @@ public class TriggerVote extends Trigger { @Override public String getImportantStackObjects(SpellAbility sa) { StringBuilder sb = new StringBuilder(); - sb.append("Voters: ").append(sa.getTriggeringObject(AbilityKey.OtherVoters)); + sb.append(Localizer.getInstance().getMessage("lblVoters")).append(": ").append(sa.getTriggeringObject(AbilityKey.OtherVoters)); return sb.toString(); } diff --git a/forge-gui/res/languages/de-DE.properties b/forge-gui/res/languages/de-DE.properties index 2311d819777..11c07a07ef4 100644 --- a/forge-gui/res/languages/de-DE.properties +++ b/forge-gui/res/languages/de-DE.properties @@ -1229,4 +1229,114 @@ lblBlocker=Blocker lblNumberAttackers=Number Attackers #TriggerAttackerUnblockedOnce.java lblAttackingPlayer=AttackingPlayer -lblDefenders=Defenders \ No newline at end of file +lblDefenders=Defenders +#TriggerBecomeMonarch.java +lblPlayer=Player +#TriggerBecomeMonstrous.java +lblMonstrous=Monstrous +#TriggerBecomeRenowned.java +lblRenowned=Renowned +#TriggerBecomesTarget.java +lblSource=Source +lblTarget=Target +#TriggerBecomesTargetOnce.java +lblTargets=Targets +#TriggerBlockersDeclared.java +lblBlockers=Blockers +#TriggerChampioned.java +lblChampioned=Championed +#TriggerChangesController.java +lblChangedController=Changed Controller +#TriggerChangesZone.java +lblZoneChanger=Zone Changer +#TriggerChangesZoneAll.java +lblAmount=Amount +#TriggerCounterAdded.java +lblAddedOnce=Added once +#TriggerCountered.java +lblCountered=Countered +lblCause=Cause +#TriggerCounteredRemoved.java +lblRemovedFrom=Removed from +#TriggerCrewed.java +lblVehicle=Vehicle +lblCrew=Crew +#TriggerCycled.java +lblCycled=Cycled +#TriggerDamageDealtOnce.java +lblDamageSource=Damage Source +lblDamaged=Damaged +#TriggerDamagePrevented.java +lblDamageTarget=Damage Target +#TriggerDestroyed.java +lblDestroyed=Destroyed +lblDestroyer=Destroyer +#TriggerDevoured.java +lblDevoured=Devoured +#TriggerDiscarded.java +lblDiscarded=Discarded +#TriggerEvolved.java +lblEvolved=Evolved +#TriggerExerted.java +lblExerted=Exerted +#TriggerExiled.java +lblExiled=Exiled +#TriggerExploited.java +lblExploited=Exploited +lblExploiter=Exploiter +#TriggerExplores.java +lblExplorer=Explorer +#TriggerFight.java +lblFighter=Fighter +#TriggerLandPlayed.java +lblLandPlayed=Land played +#TriggerLifeGained.java +lblGainedAmount=Gained Amount +#TriggerLifeLost.java +lblLostAmount=Lost Amount +#TriggerPayCumulativeUpkeep.java +lblMana=Mana +#TriggerPayLife.java +lblPaidAmount=Paid Amount +#TriggerPhaseIn.java +lblPhasedIn=Phased In +#TriggerPhaseOut.java +lblPhasedOut=Phased Out +#TriggerRoller.java +lblRoller=Roller +#TriggerPlaneswalkedFrom.java +lblPlaneswalkedFrom=Planeswalked From +#TriggerPlaneswalkedTo.java +lblPlaneswalkedTo=Planeswalked To +#TriggerRegenerated.java +lblRegenerated=Regenerated +#TriggerRevealed.java +lblRevealed=Revealed +#TriggerSacrificed.java +lblSacrificed=Sacrificed +#TriggerScry.java +lblScryer=Scryer +#TriggerSearchLibrary.java +lblSearcher=Searcher +#TriggerShuffled.java +lblShuffler=Shuffler +#TriggerSpellAbilityCast.java +lblActivator=Activator +#TriggerSpellAbilityCast.java +lblSpellAbility=SpellAbility +#TriggerTaps.java +lblTapped=Tapped +#TriggerTapsForMana.java +lblTappedForMana=Tapped for Mana +lblProduced=Produced +#TriggerTransformed.java +lblTransformed=Transformed +#TriggerTurnFaceUp.java +lblTurnFaceUp=Turn Face up +#TriggerUnattach.java +lblObject=Object +lblAttachment=Attachment +#TriggerUntaps.java +lblUntapped=Untapped +#TriggerVote.java +lblVoters=Voters \ No newline at end of file diff --git a/forge-gui/res/languages/en-US.properties b/forge-gui/res/languages/en-US.properties index 928760fa0c3..bdda816efd7 100644 --- a/forge-gui/res/languages/en-US.properties +++ b/forge-gui/res/languages/en-US.properties @@ -1262,4 +1262,81 @@ lblRemovedFrom=Removed from lblVehicle=Vehicle lblCrew=Crew #TriggerCycled.java -lblCycled=Cycled \ No newline at end of file +lblCycled=Cycled +#TriggerDamageDealtOnce.java +lblDamageSource=Damage Source +lblDamaged=Damaged +#TriggerDamagePrevented.java +lblDamageTarget=Damage Target +#TriggerDestroyed.java +lblDestroyed=Destroyed +lblDestroyer=Destroyer +#TriggerDevoured.java +lblDevoured=Devoured +#TriggerDiscarded.java +lblDiscarded=Discarded +#TriggerEvolved.java +lblEvolved=Evolved +#TriggerExerted.java +lblExerted=Exerted +#TriggerExiled.java +lblExiled=Exiled +#TriggerExploited.java +lblExploited=Exploited +lblExploiter=Exploiter +#TriggerExplores.java +lblExplorer=Explorer +#TriggerFight.java +lblFighter=Fighter +#TriggerLandPlayed.java +lblLandPlayed=Land played +#TriggerLifeGained.java +lblGainedAmount=Gained Amount +#TriggerLifeLost.java +lblLostAmount=Lost Amount +#TriggerPayCumulativeUpkeep.java +lblMana=Mana +#TriggerPayLife.java +lblPaidAmount=Paid Amount +#TriggerPhaseIn.java +lblPhasedIn=Phased In +#TriggerPhaseOut.java +lblPhasedOut=Phased Out +#TriggerRoller.java +lblRoller=Roller +#TriggerPlaneswalkedFrom.java +lblPlaneswalkedFrom=Planeswalked From +#TriggerPlaneswalkedTo.java +lblPlaneswalkedTo=Planeswalked To +#TriggerRegenerated.java +lblRegenerated=Regenerated +#TriggerRevealed.java +lblRevealed=Revealed +#TriggerSacrificed.java +lblSacrificed=Sacrificed +#TriggerScry.java +lblScryer=Scryer +#TriggerSearchLibrary.java +lblSearcher=Searcher +#TriggerShuffled.java +lblShuffler=Shuffler +#TriggerSpellAbilityCast.java +lblActivator=Activator +#TriggerSpellAbilityCast.java +lblSpellAbility=SpellAbility +#TriggerTaps.java +lblTapped=Tapped +#TriggerTapsForMana.java +lblTappedForMana=Tapped for Mana +lblProduced=Produced +#TriggerTransformed.java +lblTransformed=Transformed +#TriggerTurnFaceUp.java +lblTurnFaceUp=Turn Face up +#TriggerUnattach.java +lblObject=Object +lblAttachment=Attachment +#TriggerUntaps.java +lblUntapped=Untapped +#TriggerVote.java +lblVoters=Voters \ No newline at end of file diff --git a/forge-gui/res/languages/es-ES.properties b/forge-gui/res/languages/es-ES.properties index c047d95babb..f2fb66a8664 100644 --- a/forge-gui/res/languages/es-ES.properties +++ b/forge-gui/res/languages/es-ES.properties @@ -1262,4 +1262,81 @@ lblRemovedFrom=Eliminado de lblVehicle=Vehículo lblCrew=Tripulación #TriggerCycled.java -lblCycled=Ciclado \ No newline at end of file +lblCycled=Ciclado +#TriggerDamageDealtOnce.java +lblDamageSource=Origen del Daño +lblDamaged=Dañado +#TriggerDamagePrevented.java +lblDamageTarget=Dañar Objetivo +#TriggerDestroyed.java +lblDestroyed=Destruido +lblDestroyer=Destructor +#TriggerDevoured.java +lblDevoured=Devorado +#TriggerDiscarded.java +lblDiscarded=Descartado +#TriggerEvolved.java +lblEvolved=Evolucionado +#TriggerExerted.java +lblExerted=Ejecutado +#TriggerExiled.java +lblExiled=Exiliado +#TriggerExploited.java +lblExploited=Explotado +lblExploiter=Explotador +#TriggerExplores.java +lblExplorer=Explorador +#TriggerFight.java +lblFighter=Luchador +#TriggerLandPlayed.java +lblLandPlayed=Tierra jugada +#TriggerLifeGained.java +lblGainedAmount=Cantidad Ganada +#TriggerLifeLost.java +lblLostAmount=Cantidad Perdida +#TriggerPayCumulativeUpkeep.java +lblMana=Maná +#TriggerPayLife.java +lblPaidAmount=Cantidad Pagada +#TriggerPhaseIn.java +lblPhasedIn=En Fase +#TriggerPhaseOut.java +lblPhasedOut=Fuera de Fase +#TriggerRoller.java +lblRoller=Tirador de dados +#TriggerPlaneswalkedFrom.java +lblPlaneswalkedFrom=Planeswalked Desde +#TriggerPlaneswalkedTo.java +lblPlaneswalkedTo=Planeswalked A +#TriggerRegenerated.java +lblRegenerated=Regenerado +#TriggerRevealed.java +lblRevealed=Revelado +#TriggerSacrificed.java +lblSacrificed=Sacrificado +#TriggerScry.java +lblScryer=Escrutador +#TriggerSearchLibrary.java +lblSearcher=Buscador +#TriggerShuffled.java +lblShuffler=Barajeador +#TriggerSpellAbilityCast.java +lblActivator=Activador +#TriggerSpellAbilityCast.java +lblSpellAbility=Habilidad de Hechizo +#TriggerTaps.java +lblTapped=Girado +#TriggerTapsForMana.java +lblTappedForMana=Girado para Maná +lblProduced=Producido +#TriggerTransformed.java +lblTransformed=Transformado +#TriggerTurnFaceUp.java +lblTurnFaceUp=Poner la cara hacia arriba +#TriggerUnattach.java +lblObject=Objeto +lblAttachment=Adjunto +#TriggerUntaps.java +lblUntapped=Desgirado +#TriggerVote.java +lblVoters=Votantes \ No newline at end of file diff --git a/forge-gui/res/languages/zh-CN.properties b/forge-gui/res/languages/zh-CN.properties index 27d51590fb1..807e9701efb 100644 --- a/forge-gui/res/languages/zh-CN.properties +++ b/forge-gui/res/languages/zh-CN.properties @@ -1229,4 +1229,114 @@ lblBlocker=Blocker lblNumberAttackers=Number Attackers #TriggerAttackerUnblockedOnce.java lblAttackingPlayer=AttackingPlayer -lblDefenders=Defenders \ No newline at end of file +lblDefenders=Defenders +#TriggerBecomeMonarch.java +lblPlayer=Player +#TriggerBecomeMonstrous.java +lblMonstrous=Monstrous +#TriggerBecomeRenowned.java +lblRenowned=Renowned +#TriggerBecomesTarget.java +lblSource=Source +lblTarget=Target +#TriggerBecomesTargetOnce.java +lblTargets=Targets +#TriggerBlockersDeclared.java +lblBlockers=Blockers +#TriggerChampioned.java +lblChampioned=Championed +#TriggerChangesController.java +lblChangedController=Changed Controller +#TriggerChangesZone.java +lblZoneChanger=Zone Changer +#TriggerChangesZoneAll.java +lblAmount=Amount +#TriggerCounterAdded.java +lblAddedOnce=Added once +#TriggerCountered.java +lblCountered=Countered +lblCause=Cause +#TriggerCounteredRemoved.java +lblRemovedFrom=Removed from +#TriggerCrewed.java +lblVehicle=Vehicle +lblCrew=Crew +#TriggerCycled.java +lblCycled=Cycled +#TriggerDamageDealtOnce.java +lblDamageSource=Damage Source +lblDamaged=Damaged +#TriggerDamagePrevented.java +lblDamageTarget=Damage Target +#TriggerDestroyed.java +lblDestroyed=Destroyed +lblDestroyer=Destroyer +#TriggerDevoured.java +lblDevoured=Devoured +#TriggerDiscarded.java +lblDiscarded=Discarded +#TriggerEvolved.java +lblEvolved=Evolved +#TriggerExerted.java +lblExerted=Exerted +#TriggerExiled.java +lblExiled=Exiled +#TriggerExploited.java +lblExploited=Exploited +lblExploiter=Exploiter +#TriggerExplores.java +lblExplorer=Explorer +#TriggerFight.java +lblFighter=Fighter +#TriggerLandPlayed.java +lblLandPlayed=Land played +#TriggerLifeGained.java +lblGainedAmount=Gained Amount +#TriggerLifeLost.java +lblLostAmount=Lost Amount +#TriggerPayCumulativeUpkeep.java +lblMana=Mana +#TriggerPayLife.java +lblPaidAmount=Paid Amount +#TriggerPhaseIn.java +lblPhasedIn=Phased In +#TriggerPhaseOut.java +lblPhasedOut=Phased Out +#TriggerRoller.java +lblRoller=Roller +#TriggerPlaneswalkedFrom.java +lblPlaneswalkedFrom=Planeswalked From +#TriggerPlaneswalkedTo.java +lblPlaneswalkedTo=Planeswalked To +#TriggerRegenerated.java +lblRegenerated=Regenerated +#TriggerRevealed.java +lblRevealed=Revealed +#TriggerSacrificed.java +lblSacrificed=Sacrificed +#TriggerScry.java +lblScryer=Scryer +#TriggerSearchLibrary.java +lblSearcher=Searcher +#TriggerShuffled.java +lblShuffler=Shuffler +#TriggerSpellAbilityCast.java +lblActivator=Activator +#TriggerSpellAbilityCast.java +lblSpellAbility=SpellAbility +#TriggerTaps.java +lblTapped=Tapped +#TriggerTapsForMana.java +lblTappedForMana=Tapped for Mana +lblProduced=Produced +#TriggerTransformed.java +lblTransformed=Transformed +#TriggerTurnFaceUp.java +lblTurnFaceUp=Turn Face up +#TriggerUnattach.java +lblObject=Object +lblAttachment=Attachment +#TriggerUntaps.java +lblUntapped=Untapped +#TriggerVote.java +lblVoters=Voters \ No newline at end of file