From 21141f3b6a03812fa46bbe9bbe72d9fdf9f58a88 Mon Sep 17 00:00:00 2001 From: Peter Date: Sun, 28 Jul 2019 09:50:49 +0200 Subject: [PATCH] Mobile: Preload card translations and show card name and overlay translated --- forge-gui-mobile/src/forge/Forge.java | 4 ++++ forge-gui-mobile/src/forge/card/CardImageRenderer.java | 2 +- forge-gui-mobile/src/forge/card/CardRenderer.java | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/forge-gui-mobile/src/forge/Forge.java b/forge-gui-mobile/src/forge/Forge.java index d24e17319b4..c2f3b3347d4 100644 --- a/forge-gui-mobile/src/forge/Forge.java +++ b/forge-gui-mobile/src/forge/Forge.java @@ -10,6 +10,7 @@ import forge.assets.AssetsDownloader; import forge.assets.FSkin; import forge.assets.FSkinFont; import forge.assets.ImageCache; +import forge.card.CardTranslation; import forge.error.BugReporter; import forge.error.ExceptionHandler; import forge.interfaces.IDeviceAdapter; @@ -97,6 +98,9 @@ public class Forge implements ApplicationListener { splashScreen.getProgressBar().setDescription("Loading fonts..."); FSkinFont.preloadAll(); + splashScreen.getProgressBar().setDescription("Loading card translations..."); + CardTranslation.preloadTranslation(prefs.getPref(FPref.UI_LANGUAGE)); + splashScreen.getProgressBar().setDescription("Finishing startup..."); Gdx.app.postRunnable(new Runnable() { diff --git a/forge-gui-mobile/src/forge/card/CardImageRenderer.java b/forge-gui-mobile/src/forge/card/CardImageRenderer.java index 19d47ce7057..e00d246753d 100644 --- a/forge-gui-mobile/src/forge/card/CardImageRenderer.java +++ b/forge-gui-mobile/src/forge/card/CardImageRenderer.java @@ -183,7 +183,7 @@ public class CardImageRenderer { //draw name for card x += padding; w -= 2 * padding; - g.drawText(state.getName(), NAME_FONT, Color.BLACK, x, y, w - manaCostWidth - padding, h, false, HAlignment.LEFT, true); + g.drawText(CardTranslation.getTranslatedName(state.getName()), NAME_FONT, Color.BLACK, x, y, w - manaCostWidth - padding, h, false, HAlignment.LEFT, true); } public static final FBufferedImage forgeArt; diff --git a/forge-gui-mobile/src/forge/card/CardRenderer.java b/forge-gui-mobile/src/forge/card/CardRenderer.java index c393b17b522..ee83ffef585 100644 --- a/forge-gui-mobile/src/forge/card/CardRenderer.java +++ b/forge-gui-mobile/src/forge/card/CardRenderer.java @@ -447,7 +447,7 @@ public class CardRenderer { //draw name and mana cost overlays if card is small or default card image being used if (h <= NAME_COST_THRESHOLD && canShow) { if (showCardNameOverlay(card)) { - g.drawOutlinedText(details.getName(), FSkinFont.forHeight(h * 0.18f), Color.WHITE, Color.BLACK, x + padding, y + padding, w - 2 * padding, h * 0.4f, true, HAlignment.LEFT, false); + g.drawOutlinedText(CardTranslation.getTranslatedName(details.getName()), FSkinFont.forHeight(h * 0.18f), Color.WHITE, Color.BLACK, x + padding, y + padding, w - 2 * padding, h * 0.4f, true, HAlignment.LEFT, false); } if (showCardManaCostOverlay(card)) { float manaSymbolSize = w / 4;