external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-18 11:48:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

ImageFetcher now gets language code directly from CardEdition and not from current locale

Browse Source
This commit is contained in:
leriomaggio
2021-06-05 15:17:32 +01:00
parent ace7998c40
commit 6f27a0db4d
1 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
forge-gui/src/main/java/forge/util/ImageFetcher.java
View File

@@ -39,13 +39,14 @@ public abstract class ImageFetcher {
private HashMap<String, HashSet<Callback>> currentFetches = new HashMap<>(); private HashMap<String, HashSet<Callback>> currentFetches = new HashMap<>();
private HashMap<String, String> tokenImages; private HashMap<String, String> tokenImages;
private String getScryfallDownloadURL(PaperCard c, boolean backFace, String langCode){ private String getScryfallDownloadURL(PaperCard c, boolean backFace){
StaticData data = StaticData.instance(); StaticData data = StaticData.instance();
CardEdition edition = data.getEditions().get(c.getEdition()); CardEdition edition = data.getEditions().get(c.getEdition());
if (edition == null) // edition does not exist - some error occurred with card data if (edition == null) // edition does not exist - some error occurred with card data
return null; return null;
// 1. Try MCI code first, as it original. // 1. Try MCI code first, as it original.
String setCode = edition.getScryfallCode(); String setCode = edition.getScryfallCode();
String langCode = edition.getCardsLangCode();
return ForgeConstants.URL_PIC_SCRYFALL_DOWNLOAD + return ForgeConstants.URL_PIC_SCRYFALL_DOWNLOAD +
ImageUtil.getScryfallDownloadUrl(c, backFace, setCode, langCode); ImageUtil.getScryfallDownloadUrl(c, backFace, setCode, langCode);
} }
@@ -82,11 +83,7 @@ public abstract class ImageFetcher {
downloadUrls.add(setDownload.toString()); downloadUrls.add(setDownload.toString());
final String cardCollectorNumber = paperCard.getCollectorNumber(); final String cardCollectorNumber = paperCard.getCollectorNumber();
if (!cardCollectorNumber.equals(IPaperCard.NO_COLLECTOR_NUMBER)){ if (!cardCollectorNumber.equals(IPaperCard.NO_COLLECTOR_NUMBER)){
String langCode = "en"; final String scryfallURL = this.getScryfallDownloadURL(paperCard, backFace);
String UILang = FModel.getPreferences().getPref(ForgePreferences.FPref.UI_LANGUAGE);
if (langCodeMap.containsKey(UILang))
langCode = langCodeMap.get(UILang);
final String scryfallURL = this.getScryfallDownloadURL(paperCard, backFace, langCode);
if (scryfallURL != null) if (scryfallURL != null)
downloadUrls.add(scryfallURL); downloadUrls.add(scryfallURL);
} }