From e09faa3b9f8d16091f299eeb1a7b1d845f0b1d8e Mon Sep 17 00:00:00 2001 From: CCTV-1 Date: Thu, 30 Jan 2020 22:07:28 +0800 Subject: [PATCH] when card is token,do not display translation text . --- forge-gui-mobile/src/forge/card/CardImageRenderer.java | 4 +++- forge-gui/src/main/java/forge/card/CardDetailUtil.java | 3 ++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/forge-gui-mobile/src/forge/card/CardImageRenderer.java b/forge-gui-mobile/src/forge/card/CardImageRenderer.java index b2094fbaa15..3a9e12c2921 100644 --- a/forge-gui-mobile/src/forge/card/CardImageRenderer.java +++ b/forge-gui-mobile/src/forge/card/CardImageRenderer.java @@ -271,7 +271,9 @@ public class CardImageRenderer { g.drawImage(image, x + (w - iconSize) / 2, y + (h - iconSize) / 2, iconSize, iconSize); } else { - final String text = card.getText(state, CardTranslation.getTranslationTexts(state.getName(), "")); + boolean needTranslation = !card.isToken(); + final String text = card.getText(state, + needTranslation ? CardTranslation.getTranslationTexts(state.getName(), "") : null); if (StringUtils.isEmpty(text)) { return; } float padding = TEXT_FONT.getCapHeight() * 0.75f; diff --git a/forge-gui/src/main/java/forge/card/CardDetailUtil.java b/forge-gui/src/main/java/forge/card/CardDetailUtil.java index 8694427ce53..d3e180ef9e8 100644 --- a/forge-gui/src/main/java/forge/card/CardDetailUtil.java +++ b/forge-gui/src/main/java/forge/card/CardDetailUtil.java @@ -280,7 +280,8 @@ public class CardDetailUtil { area.append("\n"); } - String text = card.getText(state, CardTranslation.getTranslationTexts(state.getName(), "")); + boolean needTranslation = !card.isToken(); + String text = card.getText(state, needTranslation ? CardTranslation.getTranslationTexts(state.getName(), "") : null); // LEVEL [0-9]+-[0-9]+ // LEVEL [0-9]+\+