From a67da5956493bbdd326738fd46dfdc7f056d6aa9 Mon Sep 17 00:00:00 2001 From: leriomaggio Date: Wed, 20 Oct 2021 00:48:02 +0200 Subject: [PATCH] Unknown/Unrecognised text is not muted anymore and displayed as unknown card. Added new entry in language files (ITA already translated too) --- .../src/main/java/forge/screens/deckeditor/DeckImport.java | 7 +++---- forge-gui/res/languages/de-DE.properties | 1 + forge-gui/res/languages/en-US.properties | 1 + forge-gui/res/languages/es-ES.properties | 1 + forge-gui/res/languages/it-IT.properties | 1 + forge-gui/res/languages/ja-JP.properties | 1 + forge-gui/res/languages/zh-CN.properties | 1 + 7 files changed, 9 insertions(+), 4 deletions(-) diff --git a/forge-gui-desktop/src/main/java/forge/screens/deckeditor/DeckImport.java b/forge-gui-desktop/src/main/java/forge/screens/deckeditor/DeckImport.java index 4343d3248ac..c34a52f4c81 100644 --- a/forge-gui-desktop/src/main/java/forge/screens/deckeditor/DeckImport.java +++ b/forge-gui-desktop/src/main/java/forge/screens/deckeditor/DeckImport.java @@ -551,7 +551,6 @@ public class DeckImport extends FDialog { } private void activateCardPreview(HyperlinkEvent e) { - // FIXME: Card Status if(e.getEventType() == HyperlinkEvent.EventType.ENTERED || e.getEventType() == HyperlinkEvent.EventType.ACTIVATED) { String keyString = e.getDescription(); @@ -785,13 +784,12 @@ public class DeckImport extends FDialog { case CARD_CMC: case MANA_COLOUR: case COMMENT: + case UNKNOWN_TEXT: return token.getText(); case DECK_NAME: return String.format("%s: %s", Localizer.getInstance().getMessage("lblDeckName"), token.getText()); - - case UNKNOWN_TEXT: default: return null; @@ -817,6 +815,8 @@ public class DeckImport extends FDialog { case UNSUPPORTED_CARD: return Localizer.getInstance().getMessage("lblErrUnsupportedCard", this.currentGameType); + case UNKNOWN_TEXT: + return Localizer.getInstance().getMessage("lblWarnUnknownTxtMsg"); case UNKNOWN_CARD: return String.format("%s: %s", Localizer.getInstance().getMessage("lblWarningMsgPrefix"), Localizer.getInstance().getMessage("lblWarnUnknownCardMsg")); @@ -851,7 +851,6 @@ public class DeckImport extends FDialog { case UNKNOWN_CARD: case UNSUPPORTED_DECK_SECTION: case WARNING_MESSAGE: - return WARN_MSG_CLASS; case UNKNOWN_TEXT: case COMMENT: return COMMENT_CLASS; diff --git a/forge-gui/res/languages/de-DE.properties b/forge-gui/res/languages/de-DE.properties index f492477b6c9..422e2c22afc 100644 --- a/forge-gui/res/languages/de-DE.properties +++ b/forge-gui/res/languages/de-DE.properties @@ -2658,6 +2658,7 @@ lblWarnLimitedCard={0} in {1} lblErrCardEditionDate=Set not compliant with Release Date option lblErrUnsupportedCard=Not allowed in {0} lblWarnUnknownCardMsg=Unknown Card or Unsupported in Forge +lblWarnUnknownTxtMsg=Unrecognized or Unsupported Card or Placeholder lblWarnTooManyCommanders=Current {0} Section contains {1} potential Commander Cards: {2} lblWarnCommandersInSideExtra=Please check and move one to the Commander Section, in case. lblWarnDeckSectionNotAllowedInEditor={0} Section is not allowed in {1} diff --git a/forge-gui/res/languages/en-US.properties b/forge-gui/res/languages/en-US.properties index 0a0a028a233..18b74268c7c 100644 --- a/forge-gui/res/languages/en-US.properties +++ b/forge-gui/res/languages/en-US.properties @@ -2656,6 +2656,7 @@ lblWarnLimitedCard={0} in {1} lblErrCardEditionDate=Set not compliant with Release Date option lblErrUnsupportedCard=Not allowed in {0} lblWarnUnknownCardMsg=Unknown Card or Unsupported in Forge +lblWarnUnknownTxtMsg=Unrecognized or Unsupported Card or Placeholder lblWarnTooManyCommanders=Current {0} Section contains {1} potential Commander Cards: {2} lblWarnCommandersInSideExtra=Please check and move one to the Commander Section, in case. lblWarnDeckSectionNotAllowedInEditor={0} Section is not allowed in {1} diff --git a/forge-gui/res/languages/es-ES.properties b/forge-gui/res/languages/es-ES.properties index 991f2b8aded..ca7f719b5b4 100644 --- a/forge-gui/res/languages/es-ES.properties +++ b/forge-gui/res/languages/es-ES.properties @@ -2656,6 +2656,7 @@ lblWarnLimitedCard={0} in {1} lblErrCardEditionDate=Set not compliant with Release Date option lblErrUnsupportedCard=Not allowed in {0} lblWarnUnknownCardMsg=Unknown Card or Unsupported in Forge +lblWarnUnknownTxtMsg=Unrecognized or Unsupported Card or Placeholder lblWarnTooManyCommanders=Current {0} Section contains {1} potential Commander Cards: {2} lblWarnCommandersInSideExtra=Please check and move one to the Commander Section, in case. lblWarnDeckSectionNotAllowedInEditor={0} Section is not allowed in {1} diff --git a/forge-gui/res/languages/it-IT.properties b/forge-gui/res/languages/it-IT.properties index 021eec01988..f71e1107040 100644 --- a/forge-gui/res/languages/it-IT.properties +++ b/forge-gui/res/languages/it-IT.properties @@ -2656,6 +2656,7 @@ lblWarnLimitedCard={0} in {1} lblErrCardEditionDate=Edizione non valida secondo l'opzione sulla data di pubblicazione selezionata lblErrUnsupportedCard=Non Permesso in {0} lblWarnUnknownCardMsg=Carta Sconosciuta, o non supportata in Forge +lblWarnUnknownTxtMsg=Carda o Segnaposto non riconosciuto o non supportato lblWarnTooManyCommanders=La Sezione {0} contiene {1} potenziali carte Commander: {2} lblWarnCommandersInSideExtra=Per favore, controlla e nel caso spostane una nella sezione Commander. lblWarnDeckSectionNotAllowedInEditor={0} Sezione non รจ permessa in {1} diff --git a/forge-gui/res/languages/ja-JP.properties b/forge-gui/res/languages/ja-JP.properties index 1336ab6211e..be3cab816a7 100644 --- a/forge-gui/res/languages/ja-JP.properties +++ b/forge-gui/res/languages/ja-JP.properties @@ -2655,6 +2655,7 @@ lblWarnLimitedCard={0} in {1} lblErrCardEditionDate=Set not compliant with Release Date option lblErrUnsupportedCard=Not allowed in {0} lblWarnUnknownCardMsg=Unknown Card or Unsupported in Forge +lblWarnUnknownTxtMsg=Unrecognized or Unsupported Card or Placeholder lblWarnTooManyCommanders=Current {0} Section contains {1} potential Commander Cards: {2} lblWarnCommandersInSideExtra=Please check and move one to the Commander Section, in case. lblWarnDeckSectionNotAllowedInEditor={0} Section is not allowed in {1} diff --git a/forge-gui/res/languages/zh-CN.properties b/forge-gui/res/languages/zh-CN.properties index ef388df6229..cdb99f0a4c1 100644 --- a/forge-gui/res/languages/zh-CN.properties +++ b/forge-gui/res/languages/zh-CN.properties @@ -2657,6 +2657,7 @@ lblWarnLimitedCard={0} in {1} lblErrCardEditionDate=Set not compliant with Release Date option lblErrUnsupportedCard=Not allowed in {0} lblWarnUnknownCardMsg=Unknown Card or Unsupported in Forge +lblWarnUnknownTxtMsg=Unrecognized or Unsupported Card or Placeholder lblWarnTooManyCommanders=Current {0} Section contains {1} potential Commander Cards: {2} lblWarnCommandersInSideExtra=Please check and move one to the Commander Section, in case. lblWarnDeckSectionNotAllowedInEditor={0} Section is not allowed in {1}