diff --git a/libcockatrice_card/libcockatrice/card/database/parser/cockatrice_xml_3.cpp b/libcockatrice_card/libcockatrice/card/database/parser/cockatrice_xml_3.cpp index b6c3afc57..ba27d63c4 100644 --- a/libcockatrice_card/libcockatrice/card/database/parser/cockatrice_xml_3.cpp +++ b/libcockatrice_card/libcockatrice/card/database/parser/cockatrice_xml_3.cpp @@ -217,32 +217,27 @@ void CockatriceXml3Parser::loadCardsFromXml(QXmlStreamReader &xml) // NOTE: attributes must be read before readElementText() QXmlStreamAttributes attrs = xml.attributes(); QString setName = xml.readElementText(QXmlStreamReader::IncludeChildElements); - auto set = internalAddSet(setName); - // Only load printings from sets the user has enabled, matching the v4 loader's - // behaviour. Without this check, disabling a set has no effect on v3 databases. - if (set->getEnabled()) { - PrintingInfo setInfo(set); - if (attrs.hasAttribute("muId")) { - setInfo.setProperty("muid", attrs.value("muId").toString()); - } - - if (attrs.hasAttribute("uuId")) { - setInfo.setProperty("uuid", attrs.value("uuId").toString()); - } - - if (attrs.hasAttribute("picURL")) { - setInfo.setProperty("picurl", attrs.value("picURL").toString()); - } - - if (attrs.hasAttribute("num")) { - setInfo.setProperty("num", attrs.value("num").toString()); - } - - if (attrs.hasAttribute("rarity")) { - setInfo.setProperty("rarity", attrs.value("rarity").toString()); - } - _sets[setName].append(setInfo); + PrintingInfo setInfo(internalAddSet(setName)); + if (attrs.hasAttribute("muId")) { + setInfo.setProperty("muid", attrs.value("muId").toString()); } + + if (attrs.hasAttribute("muId")) { + setInfo.setProperty("uuid", attrs.value("uuId").toString()); + } + + if (attrs.hasAttribute("picURL")) { + setInfo.setProperty("picurl", attrs.value("picURL").toString()); + } + + if (attrs.hasAttribute("num")) { + setInfo.setProperty("num", attrs.value("num").toString()); + } + + if (attrs.hasAttribute("rarity")) { + setInfo.setProperty("rarity", attrs.value("rarity").toString()); + } + _sets[setName].append(setInfo); // related cards } else if (xmlName == "related" || xmlName == "reverse-related") { CardRelationType attach = CardRelationType::DoesNotAttach; diff --git a/oracle/translations/oracle_es.ts b/oracle/translations/oracle_es.ts index 33dbbdc3a..eeb9f71bd 100644 --- a/oracle/translations/oracle_es.ts +++ b/oracle/translations/oracle_es.ts @@ -63,7 +63,7 @@ Sets file (%1) Sets JSON file (%1) - Archivo de ediciones (%1) + @@ -172,7 +172,7 @@ spoiler - spoiler + @@ -192,7 +192,7 @@ Local file: - Archivo local: + @@ -202,7 +202,7 @@ Choose file... - Elegir archivo... + @@ -230,7 +230,7 @@ tokens - fichas + @@ -250,7 +250,7 @@ Local file: - Archivo local: + @@ -260,7 +260,7 @@ Choose file... - Elegir archivo... + @@ -391,12 +391,12 @@ Load %1 file - Cargar archivo de %1 + %1 file (%1) - archivo de %1 (%1) + @@ -420,12 +420,12 @@ Please choose a file. - Por favor elija un archivo. + Cannot open file '%1'. - No se puede abrir el archivo '%1'. + @@ -602,7 +602,7 @@ Run in no-confirm background mode - Ejecutar en modo del segundo plano sin confirmación + \ No newline at end of file