diff --git a/forge-gui/src/main/java/forge/achievement/ArcaneMaster.java b/forge-gui/src/main/java/forge/achievement/ArcaneMaster.java index 7f39f857375..a2c35c81e9f 100644 --- a/forge-gui/src/main/java/forge/achievement/ArcaneMaster.java +++ b/forge-gui/src/main/java/forge/achievement/ArcaneMaster.java @@ -3,14 +3,17 @@ package forge.achievement; import forge.game.Game; import forge.game.GameType; import forge.game.player.Player; +import forge.util.Localizer; public class ArcaneMaster extends Achievement { public ArcaneMaster() { - super("ArcaneMaster", "Arcane Master", "Win a game without casting", Integer.MAX_VALUE, - "more than 3 spells", 3, - "more than 2 spells", 2, - "more than 1 spell", 1, - "any spells", 0); + super("ArcaneMaster", Localizer.getInstance().getMessage("lblArcaneMaster"), + Localizer.getInstance().getMessage("lblWinGameWithOutCasting"), Integer.MAX_VALUE, + Localizer.getInstance().getMessage("lblMore3Spells"), 3, + Localizer.getInstance().getMessage("lblMore2Spells"), 2, + Localizer.getInstance().getMessage("lblMore1Spell"), 1, + Localizer.getInstance().getMessage("lblAnySpells"), 0 + ); } @Override @@ -26,6 +29,6 @@ public class ArcaneMaster extends Achievement { @Override protected String getNoun() { - return "Spell"; + return Localizer.getInstance().getMessage("lblSpell"); } } diff --git a/forge-gui/src/main/java/forge/achievement/Blackjack.java b/forge-gui/src/main/java/forge/achievement/Blackjack.java index b0c3d35548d..4fbb18ec821 100644 --- a/forge-gui/src/main/java/forge/achievement/Blackjack.java +++ b/forge-gui/src/main/java/forge/achievement/Blackjack.java @@ -4,16 +4,19 @@ import forge.game.Game; import forge.game.card.Card; import forge.game.player.GameLossReason; import forge.game.player.Player; +import forge.util.Localizer; public class Blackjack extends Achievement { private static final int THRESHOLD = 21; public Blackjack(int silver0, int gold0, int mythic0) { - super("Blackjack", "Blackjack", "Win a game from your commander dealing", 0, - String.format("%d combat damage", THRESHOLD), THRESHOLD, - String.format("%d combat damage", silver0), silver0, - String.format("%d combat damage", gold0), gold0, - String.format("%d combat damage", mythic0), mythic0); + super("Blackjack", Localizer.getInstance().getMessage("lblBlackjack"), + Localizer.getInstance().getMessage("lblWinGameFromYourCommanderDealing"), 0, + Localizer.getInstance().getMessage("lblNCombatDamage", String.valueOf(THRESHOLD)), THRESHOLD, + Localizer.getInstance().getMessage("lblNCombatDamage", String.valueOf(silver0)), silver0, + Localizer.getInstance().getMessage("lblNCombatDamage", String.valueOf(gold0)), gold0, + Localizer.getInstance().getMessage("lblNCombatDamage", String.valueOf(mythic0)), mythic0 + ); } @Override @@ -40,7 +43,7 @@ public class Blackjack extends Achievement { @Override public String getNoun() { - return "Damage"; + return Localizer.getInstance().getMessage("lblDamage"); } @Override diff --git a/forge-gui/src/main/java/forge/achievement/ChallengeAchievements.java b/forge-gui/src/main/java/forge/achievement/ChallengeAchievements.java index f159ad97243..7e987c3d375 100644 --- a/forge-gui/src/main/java/forge/achievement/ChallengeAchievements.java +++ b/forge-gui/src/main/java/forge/achievement/ChallengeAchievements.java @@ -5,6 +5,7 @@ import forge.game.Game; import forge.game.GameType; import forge.game.player.Player; import forge.properties.ForgeConstants; +import forge.util.Localizer; public class ChallengeAchievements extends AchievementCollection { public static final ChallengeAchievements instance = new ChallengeAchievements(); @@ -24,8 +25,14 @@ public class ChallengeAchievements extends AchievementCollection { add(new NoSpells()); add(new NoLands()); add(new Domain()); - add("Chromatic", "Chromatic", "Win a game after casting a 5 color spell", "With great color requirements comes great power."); - add("Epic", "Epic", "Win a game after resolving a spell with the Epic keyword", "When it's the last spell you ever cast, you better make it count!"); + add("Chromatic", Localizer.getInstance().getMessage("lblChromatic"), + Localizer.getInstance().getMessage("lblWinGameAfterCasting5CSpell"), + Localizer.getInstance().getMessage("lblGreatColorComesPower") + ); + add("Epic", Localizer.getInstance().getMessage("lblEpic"), + Localizer.getInstance().getMessage("lblWinGameAfterResolvingWithEpicSpell"), + Localizer.getInstance().getMessage("lblWhenItsYouLastSpellBetterMakeCount") + ); } private void add(String key0, String displayName0, String description0, String flavorText0) { @@ -39,7 +46,7 @@ public class ChallengeAchievements extends AchievementCollection { @Override protected final String getNoun() { - return "Win"; + return Localizer.getInstance().getMessage("lblWin"); } @Override @@ -54,7 +61,7 @@ public class ChallengeAchievements extends AchievementCollection { public static abstract class DeckChallengeAchievement extends ChallengeAchievement { protected DeckChallengeAchievement(String key0, String displayName0, String condition0, String flavorText0) { - super(key0, displayName0, "Win a game using a deck " + condition0, flavorText0); + super(key0, displayName0, Localizer.getInstance().getMessage("lblWinGameUsingTargetDeck", condition0), flavorText0); } @Override diff --git a/forge-gui/src/main/java/forge/achievement/DeckedOut.java b/forge-gui/src/main/java/forge/achievement/DeckedOut.java index dc6dbadd0d1..95b5ab0d74d 100644 --- a/forge-gui/src/main/java/forge/achievement/DeckedOut.java +++ b/forge-gui/src/main/java/forge/achievement/DeckedOut.java @@ -3,14 +3,17 @@ package forge.achievement; import forge.game.Game; import forge.game.player.GameLossReason; import forge.game.player.Player; +import forge.util.Localizer; public class DeckedOut extends Achievement { public DeckedOut(int silver0, int gold0, int mythic0) { - super("DeckedOut", "Decked Out", "Win a game from opponent", Integer.MAX_VALUE, - "drawing into an empty library", Integer.MAX_VALUE - 1, - String.format("drawing into an empty library by turn %d", silver0), silver0, - String.format("drawing into an empty library by turn %d", gold0), gold0, - String.format("drawing into an empty library by turn %d", mythic0), mythic0); + super("DeckedOut", Localizer.getInstance().getMessage("lblDeckedOut"), + Localizer.getInstance().getMessage("lblWinGameFromOpponent"), Integer.MAX_VALUE, + Localizer.getInstance().getMessage("lblDrawingEmptyLibrary"), Integer.MAX_VALUE - 1, + Localizer.getInstance().getMessage("lblDrawingEmptyLibraryByNTurn", String.valueOf(silver0)), silver0, + Localizer.getInstance().getMessage("lblDrawingEmptyLibraryByNTurn", String.valueOf(gold0)), gold0, + Localizer.getInstance().getMessage("lblDrawingEmptyLibraryByNTurn", String.valueOf(mythic0)), mythic0 + ); } @Override diff --git a/forge-gui/src/main/java/forge/achievement/Domain.java b/forge-gui/src/main/java/forge/achievement/Domain.java index 0fba442df1c..09bd635c057 100644 --- a/forge-gui/src/main/java/forge/achievement/Domain.java +++ b/forge-gui/src/main/java/forge/achievement/Domain.java @@ -9,10 +9,14 @@ import forge.game.zone.ZoneType; import java.util.HashMap; import java.util.HashSet; import java.util.Set; +import forge.util.Localizer; public class Domain extends ProgressiveAchievement { public Domain() { - super("Domain", "Domain", "Win a game with one of each basic land on the battlefield", "It's nice being able to cast anything you want."); + super("Domain", Localizer.getInstance().getMessage("lblDomain"), + Localizer.getInstance().getMessage("lblWinGameWithOneOfEachBasicLandOnTheBattlefield"), + Localizer.getInstance().getMessage("lblAbleToCastAnytingNiceBeing.") + ); } private HashMap basicLandMap = new HashMap() { @@ -51,6 +55,6 @@ public class Domain extends ProgressiveAchievement { @Override protected String getNoun() { - return "Win"; + return Localizer.getInstance().getMessage("lblWin"); } } diff --git a/forge-gui/src/main/java/forge/achievement/GameWinStreak.java b/forge-gui/src/main/java/forge/achievement/GameWinStreak.java index f92b7c7c939..c1e3c4e60f5 100644 --- a/forge-gui/src/main/java/forge/achievement/GameWinStreak.java +++ b/forge-gui/src/main/java/forge/achievement/GameWinStreak.java @@ -2,14 +2,17 @@ package forge.achievement; import forge.game.Game; import forge.game.player.Player; +import forge.util.Localizer; public class GameWinStreak extends StreakAchievement { public GameWinStreak(int bronze0, int silver0, int gold0, int mythic0) { - super("GameWinStreak", "Game Win Streak", null, - String.format("Win %d games in a row", bronze0), bronze0, - String.format("Win %d games in a row", silver0), silver0, - String.format("Win %d games in a row", gold0), gold0, - String.format("Win %d games in a row", mythic0), mythic0); + super("GameWinStreak", + Localizer.getInstance().getMessage("lblGameWinStreak"), null, + Localizer.getInstance().getMessage("lblWinNGamesInARow", String.valueOf(bronze0)), bronze0, + Localizer.getInstance().getMessage("lblWinNGamesInARow", String.valueOf(silver0)), silver0, + Localizer.getInstance().getMessage("lblWinNGamesInARow", String.valueOf(gold0)), gold0, + Localizer.getInstance().getMessage("lblWinNGamesInARow", String.valueOf(mythic0)), mythic0 + ); } @Override diff --git a/forge-gui/src/main/java/forge/achievement/Hellbent.java b/forge-gui/src/main/java/forge/achievement/Hellbent.java index 5fae97e0f0a..38693fa4df4 100644 --- a/forge-gui/src/main/java/forge/achievement/Hellbent.java +++ b/forge-gui/src/main/java/forge/achievement/Hellbent.java @@ -3,14 +3,17 @@ package forge.achievement; import forge.game.Game; import forge.game.player.Player; import forge.game.zone.ZoneType; +import forge.util.Localizer; public class Hellbent extends Achievement { public Hellbent() { - super("Hellbent", "Hellbent", "Win a game with no cards in your", 0, - "hand", 1, - "hand or library", 2, - "hand, library, or graveyard", 3, - "hand, library, graveyard, or battlefield", 4); + super("Hellbent", Localizer.getInstance().getMessage("lblHellbent"), + Localizer.getInstance().getMessage("lblWinGameWithNoCardsInYour"), 0, + Localizer.getInstance().getMessage("lblHandZone"), 1, + Localizer.getInstance().getMessage("lblhandOrlibrary"), 2, + Localizer.getInstance().getMessage("lblHandOrLibraryOrGraveyard"), 3, + Localizer.getInstance().getMessage("lblHandOrLibraryOrGraveyardOrBattlefield"), 4 + ); } @Override diff --git a/forge-gui/src/main/java/forge/achievement/LifeToSpare.java b/forge-gui/src/main/java/forge/achievement/LifeToSpare.java index df3e43249f9..b7c21fe336a 100644 --- a/forge-gui/src/main/java/forge/achievement/LifeToSpare.java +++ b/forge-gui/src/main/java/forge/achievement/LifeToSpare.java @@ -2,14 +2,17 @@ package forge.achievement; import forge.game.Game; import forge.game.player.Player; +import forge.util.Localizer; public class LifeToSpare extends Achievement { public LifeToSpare(int bronze0, int silver0, int gold0, int mythic0) { - super("LifeToSpare", "Life to Spare", "Win a game with", 0, - String.format("%d life more than you started with", bronze0), bronze0, - String.format("%d life more than you started with", silver0), silver0, - String.format("%d life more than you started with", gold0), gold0, - String.format("%d life more than you started with", mythic0), mythic0); + super("LifeToSpare", Localizer.getInstance().getMessage("lblLifeToSpare"), + Localizer.getInstance().getMessage("lblWinGameWith"), 0, + Localizer.getInstance().getMessage("lblMoreThanStartedLifeN", String.valueOf(bronze0)), bronze0, + Localizer.getInstance().getMessage("lblMoreThanStartedLifeN", String.valueOf(silver0)), silver0, + Localizer.getInstance().getMessage("lblMoreThanStartedLifeN", String.valueOf(gold0)), gold0, + Localizer.getInstance().getMessage("lblMoreThanStartedLifeN", String.valueOf(mythic0)), mythic0 + ); } @Override @@ -25,7 +28,7 @@ public class LifeToSpare extends Achievement { @Override protected String getNoun() { - return "Life"; + return Localizer.getInstance().getMessage("lblLife"); } @Override protected boolean pluralizeNoun() { diff --git a/forge-gui/src/main/java/forge/achievement/ManaFlooded.java b/forge-gui/src/main/java/forge/achievement/ManaFlooded.java index e6f495f0e72..eb58c2e4274 100644 --- a/forge-gui/src/main/java/forge/achievement/ManaFlooded.java +++ b/forge-gui/src/main/java/forge/achievement/ManaFlooded.java @@ -5,14 +5,17 @@ import forge.game.GameType; import forge.game.card.Card; import forge.game.player.Player; import forge.game.zone.ZoneType; +import forge.util.Localizer; public class ManaFlooded extends Achievement { public ManaFlooded(int bronze0, int silver0, int gold0, int mythic0) { - super("ManaFlooded", "Mana Flooded", "Win a game with at least", 0, - String.format("%d lands on the battlefield", bronze0), bronze0, - String.format("%d lands on the battlefield", silver0), silver0, - String.format("%d lands on the battlefield", gold0), gold0, - String.format("%d lands on the battlefield", mythic0), mythic0); + super("ManaFlooded", Localizer.getInstance().getMessage("lblManaFlooded"), + Localizer.getInstance().getMessage("lblWinGameWithLeast"), 0, + Localizer.getInstance().getMessage("lblNLandOnTheBattlefield", String.valueOf(bronze0)), bronze0, + Localizer.getInstance().getMessage("lblNLandOnTheBattlefield", String.valueOf(silver0)), silver0, + Localizer.getInstance().getMessage("lblNLandOnTheBattlefield", String.valueOf(gold0)), gold0, + Localizer.getInstance().getMessage("lblNLandOnTheBattlefield", String.valueOf(mythic0)), mythic0 + ); } @Override @@ -34,6 +37,6 @@ public class ManaFlooded extends Achievement { @Override protected String getNoun() { - return "Land"; + return Localizer.getInstance().getMessage("lblLand"); } } diff --git a/forge-gui/src/main/java/forge/achievement/ManaScrewed.java b/forge-gui/src/main/java/forge/achievement/ManaScrewed.java index 185c24ae9fe..0a30fb60b32 100644 --- a/forge-gui/src/main/java/forge/achievement/ManaScrewed.java +++ b/forge-gui/src/main/java/forge/achievement/ManaScrewed.java @@ -2,14 +2,17 @@ package forge.achievement; import forge.game.Game; import forge.game.player.Player; +import forge.util.Localizer; public class ManaScrewed extends Achievement { public ManaScrewed() { - super("ManaScrewed", "Mana Screwed", "Win a game despite playing only", Integer.MAX_VALUE, - "3 lands", 3, - "2 lands", 2, - "1 land", 1, - "0 lands", 0); + super("ManaScrewed", Localizer.getInstance().getMessage("lblManaScrewed"), + Localizer.getInstance().getMessage("lblWinGameOnlyPlaing"), Integer.MAX_VALUE, + Localizer.getInstance().getMessage("lblNLands", String.valueOf(3)), 3, + Localizer.getInstance().getMessage("lblNLands", String.valueOf(2)), 2, + Localizer.getInstance().getMessage("lblNLands", String.valueOf(1)), 1, + Localizer.getInstance().getMessage("lblNLands", String.valueOf(0)), 0 + ); } @Override @@ -22,7 +25,7 @@ public class ManaScrewed extends Achievement { @Override protected String getNoun() { - return "Land"; + return Localizer.getInstance().getMessage("lblLand"); } @Override diff --git a/forge-gui/src/main/java/forge/achievement/MatchWinStreak.java b/forge-gui/src/main/java/forge/achievement/MatchWinStreak.java index a876029d2e5..024bf47d484 100644 --- a/forge-gui/src/main/java/forge/achievement/MatchWinStreak.java +++ b/forge-gui/src/main/java/forge/achievement/MatchWinStreak.java @@ -2,14 +2,16 @@ package forge.achievement; import forge.game.Game; import forge.game.player.Player; +import forge.util.Localizer; public class MatchWinStreak extends StreakAchievement { public MatchWinStreak(int bronze0, int silver0, int gold0, int mythic0) { - super("MatchWinStreak", "Match Win Streak", null, - String.format("Win %d matches in a row", bronze0), bronze0, - String.format("Win %d matches in a row", silver0), silver0, - String.format("Win %d matches in a row", gold0), gold0, - String.format("Win %d matches in a row", mythic0), mythic0); + super("MatchWinStreak",Localizer.getInstance().getMessage("lblMatchWinStreak"), null, + Localizer.getInstance().getMessage("lblWinNMatchesInARow", String.valueOf(bronze0)), bronze0, + Localizer.getInstance().getMessage("lblWinNMatchesInARow", String.valueOf(silver0)), silver0, + Localizer.getInstance().getMessage("lblWinNMatchesInARow", String.valueOf(gold0)), gold0, + Localizer.getInstance().getMessage("lblWinNMatchesInARow", String.valueOf(mythic0)), mythic0 + ); } @Override diff --git a/forge-gui/src/main/java/forge/achievement/NeedForSpeed.java b/forge-gui/src/main/java/forge/achievement/NeedForSpeed.java index eed2c8b05e9..e5f48b19bd0 100644 --- a/forge-gui/src/main/java/forge/achievement/NeedForSpeed.java +++ b/forge-gui/src/main/java/forge/achievement/NeedForSpeed.java @@ -2,14 +2,16 @@ package forge.achievement; import forge.game.Game; import forge.game.player.Player; +import forge.util.Localizer; public class NeedForSpeed extends Achievement { public NeedForSpeed(int bronze0, int silver0, int gold0, int mythic0) { - super("NeedForSpeed", "Need for Speed", null, Integer.MAX_VALUE, - String.format("Win a game by turn %d", bronze0), bronze0, - String.format("Win a game by turn %d", silver0), silver0, - String.format("Win a game by turn %d", gold0), gold0, - String.format("Win a game by turn %d", mythic0), mythic0); + super("NeedForSpeed", Localizer.getInstance().getMessage("lblNeedForSpeed"), null, Integer.MAX_VALUE, + Localizer.getInstance().getMessage("lblWinGameByNTurn", String.valueOf(bronze0)), bronze0, + Localizer.getInstance().getMessage("lblWinGameByNTurn", String.valueOf(silver0)), silver0, + Localizer.getInstance().getMessage("lblWinGameByNTurn", String.valueOf(gold0)), gold0, + Localizer.getInstance().getMessage("lblWinGameByNTurn", String.valueOf(mythic0)), mythic0 + ); } @Override @@ -22,7 +24,7 @@ public class NeedForSpeed extends Achievement { @Override protected String getNoun() { - return "Turn"; + return Localizer.getInstance().getMessage("lblTurn"); } @Override diff --git a/forge-gui/src/main/java/forge/achievement/NoCreatures.java b/forge-gui/src/main/java/forge/achievement/NoCreatures.java index 60a3a4a1db8..9eea8bbf086 100644 --- a/forge-gui/src/main/java/forge/achievement/NoCreatures.java +++ b/forge-gui/src/main/java/forge/achievement/NoCreatures.java @@ -5,10 +5,13 @@ import java.util.Map.Entry; import forge.achievement.ChallengeAchievements.DeckChallengeAchievement; import forge.deck.Deck; import forge.item.PaperCard; +import forge.util.Localizer; public class NoCreatures extends DeckChallengeAchievement { public NoCreatures() { - super("NoCreatures", "No Creatures", "with no creatures", "I'm not really an animal person."); + super("NoCreatures", Localizer.getInstance().getMessage("lblNoCreatures"), + Localizer.getInstance().getMessage("lblWithNoCreatures"), Localizer.getInstance().getMessage("lblIMNotReallyAnimalPerson") + ); } @Override diff --git a/forge-gui/src/main/java/forge/achievement/NoLands.java b/forge-gui/src/main/java/forge/achievement/NoLands.java index 14de3d3021e..89e28fb9d55 100644 --- a/forge-gui/src/main/java/forge/achievement/NoLands.java +++ b/forge-gui/src/main/java/forge/achievement/NoLands.java @@ -5,10 +5,14 @@ import java.util.Map.Entry; import forge.achievement.ChallengeAchievements.DeckChallengeAchievement; import forge.deck.Deck; import forge.item.PaperCard; +import forge.util.Localizer; public class NoLands extends DeckChallengeAchievement { public NoLands() { - super("NoLands", "No Lands", "with no lands", "I prefer mana from more artificial sources."); + super("NoLands", Localizer.getInstance().getMessage("lblNoLands"), + Localizer.getInstance().getMessage("lblWithNoLands"), + Localizer.getInstance().getMessage("lblIMorePreferManaFromArtificial") + ); } @Override diff --git a/forge-gui/src/main/java/forge/achievement/NoSpells.java b/forge-gui/src/main/java/forge/achievement/NoSpells.java index 249efad03ec..96765abf828 100644 --- a/forge-gui/src/main/java/forge/achievement/NoSpells.java +++ b/forge-gui/src/main/java/forge/achievement/NoSpells.java @@ -6,10 +6,14 @@ import forge.achievement.ChallengeAchievements.DeckChallengeAchievement; import forge.card.CardType; import forge.deck.Deck; import forge.item.PaperCard; +import forge.util.Localizer; public class NoSpells extends DeckChallengeAchievement { public NoSpells() { - super("NoSpells", "No Spells", "with only creatures and lands", "I let my army do the talking."); + super("NoSpells", Localizer.getInstance().getMessage("lblNoSpells"), + Localizer.getInstance().getMessage("lblWithOnlyCreaturesAndLands"), + Localizer.getInstance().getMessage("lblILetMyArmyTalking") + ); } @Override diff --git a/forge-gui/src/main/java/forge/achievement/Overkill.java b/forge-gui/src/main/java/forge/achievement/Overkill.java index 42b28aa3071..eff0ea61bb3 100644 --- a/forge-gui/src/main/java/forge/achievement/Overkill.java +++ b/forge-gui/src/main/java/forge/achievement/Overkill.java @@ -2,14 +2,17 @@ package forge.achievement; import forge.game.Game; import forge.game.player.Player; +import forge.util.Localizer; public class Overkill extends Achievement { public Overkill(int bronze0, int silver0, int gold0, int mythic0) { - super("Overkill", "Overkill", "Win a game with opponent at", 0, - String.format("%d life", bronze0), bronze0, - String.format("%d life", silver0), silver0, - String.format("%d life", gold0), gold0, - String.format("%d life", mythic0), mythic0); + super("Overkill", Localizer.getInstance().getMessage("lblOverkill"), + Localizer.getInstance().getMessage("lblWinGameWithOppentAt"), 0, + Localizer.getInstance().getMessage("lblNLife", String.valueOf(bronze0)), bronze0, + Localizer.getInstance().getMessage("lblNLife", String.valueOf(silver0)), silver0, + Localizer.getInstance().getMessage("lblNLife", String.valueOf(gold0)), gold0, + Localizer.getInstance().getMessage("lblNLife", String.valueOf(mythic0)), mythic0 + ); } @Override @@ -25,7 +28,7 @@ public class Overkill extends Achievement { @Override protected String getNoun() { - return "Life"; + return Localizer.getInstance().getMessage("lblLife"); } @Override protected boolean pluralizeNoun() { diff --git a/forge-gui/src/main/java/forge/achievement/PlaneswalkerAchievements.java b/forge-gui/src/main/java/forge/achievement/PlaneswalkerAchievements.java index 511bba6a0a4..850c52ab44d 100644 --- a/forge-gui/src/main/java/forge/achievement/PlaneswalkerAchievements.java +++ b/forge-gui/src/main/java/forge/achievement/PlaneswalkerAchievements.java @@ -8,6 +8,8 @@ import forge.game.player.Player; import forge.item.IPaperCard; import forge.model.FModel; import forge.properties.ForgeConstants; +import forge.util.Localizer; +import forge.util.CardTranslation; public class PlaneswalkerAchievements extends AchievementCollection { public static final PlaneswalkerAchievements instance = new PlaneswalkerAchievements(); @@ -49,7 +51,7 @@ public class PlaneswalkerAchievements extends AchievementCollection { private class PlaneswalkerUltimate extends ProgressiveAchievement { private PlaneswalkerUltimate(String cardName0, String displayName0, String flavorText0) { - super(cardName0, displayName0, "Win a game after activating " + cardName0 + "'s ultimate", flavorText0); + super(cardName0, displayName0, Localizer.getInstance().getMessage("lblWinGameAfterActivatingCardUltimate", CardTranslation.getTranslatedName(cardName0)), flavorText0); } @Override @@ -64,7 +66,7 @@ public class PlaneswalkerAchievements extends AchievementCollection { @Override protected String getNoun() { - return "Win"; + return Localizer.getInstance().getMessage("lblWin"); } } } diff --git a/forge-gui/src/main/java/forge/achievement/Poisoned.java b/forge-gui/src/main/java/forge/achievement/Poisoned.java index 5625ccf4e7d..4afe8801224 100644 --- a/forge-gui/src/main/java/forge/achievement/Poisoned.java +++ b/forge-gui/src/main/java/forge/achievement/Poisoned.java @@ -3,16 +3,19 @@ package forge.achievement; import forge.game.Game; import forge.game.player.GameLossReason; import forge.game.player.Player; +import forge.util.Localizer; public class Poisoned extends Achievement { private static final int THRESHOLD = 10; public Poisoned(int silver0, int gold0, int mythic0) { - super("Poisoned", "Poisoned", "Win a game by giving opponent", 0, - String.format("%d poison counters", THRESHOLD), THRESHOLD, - String.format("%d poison counters", silver0), silver0, - String.format("%d poison counters", gold0), gold0, - String.format("%d poison counters", mythic0), mythic0); + super("Poisoned", Localizer.getInstance().getMessage("lblPoisoned"), + Localizer.getInstance().getMessage("lblWinGameByGivingOppoent"), 0, + Localizer.getInstance().getMessage("lblNPoisonCounters", String.valueOf(THRESHOLD)), THRESHOLD, + Localizer.getInstance().getMessage("lblNPoisonCounters", String.valueOf(silver0)), silver0, + Localizer.getInstance().getMessage("lblNPoisonCounters", String.valueOf(gold0)), gold0, + Localizer.getInstance().getMessage("lblNPoisonCounters", String.valueOf(mythic0)), mythic0 + ); } @Override @@ -28,6 +31,6 @@ public class Poisoned extends Achievement { @Override protected String getNoun() { - return "Counter"; + return Localizer.getInstance().getMessage("lblCounter"); } } diff --git a/forge-gui/src/main/java/forge/achievement/RagsToRiches.java b/forge-gui/src/main/java/forge/achievement/RagsToRiches.java index 87ad3637e3b..f7e96e42829 100644 --- a/forge-gui/src/main/java/forge/achievement/RagsToRiches.java +++ b/forge-gui/src/main/java/forge/achievement/RagsToRiches.java @@ -2,14 +2,17 @@ package forge.achievement; import forge.game.Game; import forge.game.player.Player; +import forge.util.Localizer; public class RagsToRiches extends Achievement { public RagsToRiches() { - super("RagsToRiches", "Rags to Riches", "Win a game after mulliganing to", 7, - "4 cards", 4, - "3 cards", 3, - "2 cards", 2, - "1 card", 1); + super("RagsToRiches", Localizer.getInstance().getMessage("lblRagsToRiches"), + Localizer.getInstance().getMessage("lblWinGameAfterMulliganingTo"), 7, + Localizer.getInstance().getMessage("lblNCards", String.valueOf(4)), 4, + Localizer.getInstance().getMessage("lblNCards", String.valueOf(3)), 3, + Localizer.getInstance().getMessage("lblNCards", String.valueOf(2)), 2, + Localizer.getInstance().getMessage("lblNCards", String.valueOf(1)), 1 + ); } @Override @@ -22,6 +25,6 @@ public class RagsToRiches extends Achievement { @Override protected String getNoun() { - return "Card"; + return Localizer.getInstance().getMessage("lblCard"); } } diff --git a/forge-gui/src/main/java/forge/achievement/StormChaser.java b/forge-gui/src/main/java/forge/achievement/StormChaser.java index eb34e99c243..ab4dda64919 100644 --- a/forge-gui/src/main/java/forge/achievement/StormChaser.java +++ b/forge-gui/src/main/java/forge/achievement/StormChaser.java @@ -2,14 +2,17 @@ package forge.achievement; import forge.game.Game; import forge.game.player.Player; +import forge.util.Localizer; public class StormChaser extends Achievement { public StormChaser(int bronze0, int silver0, int gold0, int mythic0) { - super("StormChaser", "Storm Chaser", "Win a game after casting", 0, - String.format("%d spells in a single turn", bronze0), bronze0, - String.format("%d spells in a single turn", silver0), silver0, - String.format("%d spells in a single turn", gold0), gold0, - String.format("%d spells in a single turn", mythic0), mythic0); + super("StormChaser", Localizer.getInstance().getMessage("lblStormChaser"), + Localizer.getInstance().getMessage("lblWinGameAfterCasting"), 0, + Localizer.getInstance().getMessage("lblNSpellInSingleTurn", String.valueOf(bronze0)), bronze0, + Localizer.getInstance().getMessage("lblNSpellInSingleTurn", String.valueOf(silver0)), silver0, + Localizer.getInstance().getMessage("lblNSpellInSingleTurn", String.valueOf(gold0)), gold0, + Localizer.getInstance().getMessage("lblNSpellInSingleTurn", String.valueOf(mythic0)), mythic0 + ); } @Override @@ -22,6 +25,6 @@ public class StormChaser extends Achievement { @Override protected String getNoun() { - return "Spell"; + return Localizer.getInstance().getMessage("lblSpell"); } } diff --git a/forge-gui/src/main/java/forge/achievement/TotalGameWins.java b/forge-gui/src/main/java/forge/achievement/TotalGameWins.java index 662f8862438..66e0c0f8c3b 100644 --- a/forge-gui/src/main/java/forge/achievement/TotalGameWins.java +++ b/forge-gui/src/main/java/forge/achievement/TotalGameWins.java @@ -2,14 +2,16 @@ package forge.achievement; import forge.game.Game; import forge.game.player.Player; +import forge.util.Localizer; public class TotalGameWins extends ProgressiveAchievement { public TotalGameWins(int bronze0, int silver0, int gold0, int mythic0) { - super("TotalGameWins", "Total Game Wins", null, - String.format("Win %d games", bronze0), bronze0, - String.format("Win %d games", silver0), silver0, - String.format("Win %d games", gold0), gold0, - String.format("Win %d games", mythic0), mythic0); + super("TotalGameWins", Localizer.getInstance().getMessage("lblTotalGameWins"), null, + Localizer.getInstance().getMessage("lblWinNGames", String.valueOf(bronze0)), bronze0, + Localizer.getInstance().getMessage("lblWinNGames", String.valueOf(silver0)), silver0, + Localizer.getInstance().getMessage("lblWinNGames", String.valueOf(gold0)), gold0, + Localizer.getInstance().getMessage("lblWinNGames", String.valueOf(mythic0)), mythic0 + ); } @Override @@ -19,6 +21,6 @@ public class TotalGameWins extends ProgressiveAchievement { @Override protected String getNoun() { - return "Game"; + return Localizer.getInstance().getMessage("lblGame"); } } diff --git a/forge-gui/src/main/java/forge/achievement/TotalMatchWins.java b/forge-gui/src/main/java/forge/achievement/TotalMatchWins.java index 82c28537fcd..c675128e7c5 100644 --- a/forge-gui/src/main/java/forge/achievement/TotalMatchWins.java +++ b/forge-gui/src/main/java/forge/achievement/TotalMatchWins.java @@ -2,14 +2,16 @@ package forge.achievement; import forge.game.Game; import forge.game.player.Player; +import forge.util.Localizer; public class TotalMatchWins extends ProgressiveAchievement { public TotalMatchWins(int bronze0, int silver0, int gold0, int mythic0) { - super("TotalMatchWins", "Total Match Wins", null, - String.format("Win %d matches", bronze0), bronze0, - String.format("Win %d matches", silver0), silver0, - String.format("Win %d matches", gold0), gold0, - String.format("Win %d matches", mythic0), mythic0); + super("TotalMatchWins", Localizer.getInstance().getMessage("lblTotalMatchWins"), null, + Localizer.getInstance().getMessage("lblWinNMatches", String.valueOf(bronze0)), bronze0, + Localizer.getInstance().getMessage("lblWinNMatches", String.valueOf(silver0)), silver0, + Localizer.getInstance().getMessage("lblWinNMatches", String.valueOf(gold0)), gold0, + Localizer.getInstance().getMessage("lblWinNMatches", String.valueOf(mythic0)), mythic0 + ); } @Override @@ -19,6 +21,6 @@ public class TotalMatchWins extends ProgressiveAchievement { @Override protected String getNoun() { - return "Match"; + return Localizer.getInstance().getMessage("lblMatch"); } } diff --git a/forge-gui/src/main/java/forge/achievement/TotalPuzzlesSolved.java b/forge-gui/src/main/java/forge/achievement/TotalPuzzlesSolved.java index 56d5f202d8e..fe3760e5c28 100644 --- a/forge-gui/src/main/java/forge/achievement/TotalPuzzlesSolved.java +++ b/forge-gui/src/main/java/forge/achievement/TotalPuzzlesSolved.java @@ -2,14 +2,16 @@ package forge.achievement; import forge.game.Game; import forge.game.player.Player; +import forge.util.Localizer; public class TotalPuzzlesSolved extends ProgressiveAchievement { public TotalPuzzlesSolved(int bronze0, int silver0, int gold0, int mythic0) { - super("TotalPuzzlesSolved", "Total Puzzles Solved", null, - String.format(bronze0 == 1 ? "Solve a puzzle" : "Solve %d puzzles", bronze0), bronze0, - String.format("Solve %d puzzles", silver0), silver0, - String.format("Solve %d puzzles", gold0), gold0, - String.format("Solve %d puzzles", mythic0), mythic0); + super("TotalPuzzlesSolved", Localizer.getInstance().getMessage("lblTotalPuzzlesSolved"), null, + Localizer.getInstance().getMessage("lblSolveNPuzzles", String.valueOf(bronze0)), bronze0, + Localizer.getInstance().getMessage("lblSolveNPuzzles", String.valueOf(silver0)), silver0, + Localizer.getInstance().getMessage("lblSolveNPuzzles", String.valueOf(gold0)), gold0, + Localizer.getInstance().getMessage("lblSolveNPuzzles", String.valueOf(mythic0)), mythic0 + ); } @Override @@ -19,7 +21,7 @@ public class TotalPuzzlesSolved extends ProgressiveAchievement { @Override protected String getNoun() { - return "Puzzle"; + return Localizer.getInstance().getMessage("lblPuzzle"); } } diff --git a/forge-gui/src/main/java/forge/achievement/VariantWins.java b/forge-gui/src/main/java/forge/achievement/VariantWins.java index 77a7e38f71d..9355dd4ee4b 100644 --- a/forge-gui/src/main/java/forge/achievement/VariantWins.java +++ b/forge-gui/src/main/java/forge/achievement/VariantWins.java @@ -3,17 +3,17 @@ package forge.achievement; import forge.game.Game; import forge.game.GameType; import forge.game.player.Player; -import forge.util.Lang; +import forge.util.Localizer; public class VariantWins extends ProgressiveAchievement { private GameType variant; public VariantWins(GameType variant0, int silver0, int gold0, int mythic0) { super(variant0.name(), variant0.toString(), null, - "Win " + Lang.nounWithAmount(1, variant0.toString() + " game"), 1, - "Win " + Lang.nounWithAmount(silver0, variant0.toString() + " game"), silver0, - "Win " + Lang.nounWithAmount(gold0, variant0.toString() + " game"), gold0, - "Win " + Lang.nounWithAmount(mythic0, variant0.toString() + " game"), mythic0); + Localizer.getInstance().getMessage("lblWinNVariantGame", 1, variant0.toString()), 1, + Localizer.getInstance().getMessage("lblWinNVariantGame", silver0, variant0.toString()), silver0, + Localizer.getInstance().getMessage("lblWinNVariantGame", gold0, variant0.toString()), gold0, + Localizer.getInstance().getMessage("lblWinNVariantGame", mythic0, variant0.toString()), mythic0); variant = variant0; } @@ -32,6 +32,6 @@ public class VariantWins extends ProgressiveAchievement { @Override protected String getNoun() { - return "Win"; + return Localizer.getInstance().getMessage("lblWin"); } }