From f1e204408f319208bc1003b864084206a394ca5a Mon Sep 17 00:00:00 2001 From: Oleg Agafonov Date: Sun, 19 May 2019 22:51:18 +0400 Subject: [PATCH] Fixed umlaut --- .../java/mage/client/util/gui/countryBox/CountryComboBox.java | 2 +- .../org/mage/plugins/card/dl/sources/GrabbagImageSource.java | 2 +- Mage.Sets/src/mage/sets/StarWars.java | 2 +- .../main/java/mage/cards/decks/importer/TxtDeckImporter.java | 2 ++ 4 files changed, 5 insertions(+), 3 deletions(-) diff --git a/Mage.Client/src/main/java/mage/client/util/gui/countryBox/CountryComboBox.java b/Mage.Client/src/main/java/mage/client/util/gui/countryBox/CountryComboBox.java index 92247592aa..3fb930e2b1 100644 --- a/Mage.Client/src/main/java/mage/client/util/gui/countryBox/CountryComboBox.java +++ b/Mage.Client/src/main/java/mage/client/util/gui/countryBox/CountryComboBox.java @@ -194,7 +194,7 @@ public class CountryComboBox extends JComboBox { {"Portugal", "pt"}, {"Puerto Rico", "pr"}, {"Qatar", "qa"}, - {"Réunion", "re"}, + {"Reunion", "re"}, {"Romania", "ro"}, {"Russian Federation", "ru"}, {"Rwanda", "rw"}, diff --git a/Mage.Client/src/main/java/org/mage/plugins/card/dl/sources/GrabbagImageSource.java b/Mage.Client/src/main/java/org/mage/plugins/card/dl/sources/GrabbagImageSource.java index e38898760f..b8c9e2b65b 100644 --- a/Mage.Client/src/main/java/org/mage/plugins/card/dl/sources/GrabbagImageSource.java +++ b/Mage.Client/src/main/java/org/mage/plugins/card/dl/sources/GrabbagImageSource.java @@ -290,7 +290,7 @@ public enum GrabbagImageSource implements CardImageSource { singleLinks.put("SWS/Senator Bail Organa", "BRkUuYU.jpg"); singleLinks.put("SWS/Senator Lott Dod", "yYQtXZo.jpg"); singleLinks.put("SWS/Senator Onaconda Farr", "oPez77z.png"); - singleLinks.put("SWS/Senator Padmé Amidala", "287deD9.jpg"); + singleLinks.put("SWS/Senator Padme Amidala", "287deD9.jpg"); singleLinks.put("SWS/Senator Passel Argente", "51qpnaE.jpg"); singleLinks.put("SWS/Shaak Herd", "PtnZD0I.jpg"); singleLinks.put("SWS/Shadow Trooper", "09NAiGa.jpg"); diff --git a/Mage.Sets/src/mage/sets/StarWars.java b/Mage.Sets/src/mage/sets/StarWars.java index 01f57bf33b..2ebff3c3f8 100644 --- a/Mage.Sets/src/mage/sets/StarWars.java +++ b/Mage.Sets/src/mage/sets/StarWars.java @@ -290,7 +290,7 @@ public final class StarWars extends ExpansionSet { cards.add(new SetCardInfo("Senator Bail Organa", 209, Rarity.UNCOMMON, mage.cards.s.SenatorBailOrgana.class)); cards.add(new SetCardInfo("Senator Lott Dod", 210, Rarity.UNCOMMON, mage.cards.s.SenatorLottDod.class)); cards.add(new SetCardInfo("Senator Onaconda Farr", 211, Rarity.UNCOMMON, mage.cards.s.SenatorOnacondaFarr.class)); - cards.add(new SetCardInfo("Senator Padmé Amidala", 212, Rarity.UNCOMMON, mage.cards.s.SenatorPadmeAmidala.class)); + cards.add(new SetCardInfo("Senator Padme Amidala", 212, Rarity.UNCOMMON, mage.cards.s.SenatorPadmeAmidala.class)); cards.add(new SetCardInfo("Senator Passel Argente", 213, Rarity.UNCOMMON, mage.cards.s.SenatorPasselArgente.class)); cards.add(new SetCardInfo("Shaak Herd", 155, Rarity.COMMON, mage.cards.s.ShaakHerd.class)); cards.add(new SetCardInfo("Shadow Trooper", 56, Rarity.COMMON, mage.cards.s.ShadowTrooper.class)); diff --git a/Mage/src/main/java/mage/cards/decks/importer/TxtDeckImporter.java b/Mage/src/main/java/mage/cards/decks/importer/TxtDeckImporter.java index 2941efcd6b..6e3e0e66e2 100644 --- a/Mage/src/main/java/mage/cards/decks/importer/TxtDeckImporter.java +++ b/Mage/src/main/java/mage/cards/decks/importer/TxtDeckImporter.java @@ -117,6 +117,8 @@ public class TxtDeckImporter extends PlainTextDeckImporter { .replace("í", "i") .replace("â", "a") .replace("á", "a") + .replace("à", "a") + .replace("é", "e") .replace("ú", "u") .replace("\"", "'"); if (lineName.contains("//") && !lineName.contains(" // ")) {