From 5fffa200f76ea877a45b49413cbc2487c68bd75d Mon Sep 17 00:00:00 2001 From: Diego Prado Gesto Date: Tue, 7 May 2019 12:04:19 +0200 Subject: [PATCH 1/2] Make the "Not supported" profile label translatable Contributes to CURA-6502. --- cura/Settings/cura_empty_instance_containers.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/cura/Settings/cura_empty_instance_containers.py b/cura/Settings/cura_empty_instance_containers.py index 534e6f4199..0eedfc8654 100644 --- a/cura/Settings/cura_empty_instance_containers.py +++ b/cura/Settings/cura_empty_instance_containers.py @@ -1,9 +1,11 @@ -# Copyright (c) 2018 Ultimaker B.V. +# Copyright (c) 2019 Ultimaker B.V. # Cura is released under the terms of the LGPLv3 or higher. import copy from UM.Settings.constant_instance_containers import EMPTY_CONTAINER_ID, empty_container +from UM.i18n import i18nCatalog +catalog = i18nCatalog("cura") # Empty definition changes @@ -28,7 +30,7 @@ empty_material_container.setMetaDataEntry("type", "material") EMPTY_QUALITY_CONTAINER_ID = "empty_quality" empty_quality_container = copy.deepcopy(empty_container) empty_quality_container.setMetaDataEntry("id", EMPTY_QUALITY_CONTAINER_ID) -empty_quality_container.setName("Not Supported") +empty_quality_container.setName(catalog.i18nc("@info:not supported profile", "Not supported")) empty_quality_container.setMetaDataEntry("quality_type", "not_supported") empty_quality_container.setMetaDataEntry("type", "quality") empty_quality_container.setMetaDataEntry("supported", False) From 5e43e723e7b9dcfc849f2c2454ebf61b7a2070a5 Mon Sep 17 00:00:00 2001 From: Lipu Fei Date: Tue, 7 May 2019 14:27:32 +0200 Subject: [PATCH 2/2] Fix activeMaterialsCompatible() CURA-6511 Looks like a merge conflict --- cura/Settings/MachineManager.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cura/Settings/MachineManager.py b/cura/Settings/MachineManager.py index cd6c7cd191..ed797882b6 100755 --- a/cura/Settings/MachineManager.py +++ b/cura/Settings/MachineManager.py @@ -1263,8 +1263,8 @@ class MachineManager(QObject): if self._global_container_stack is not None: if Util.parseBool(self._global_container_stack.getMetaDataEntry("has_materials", False)): for position, extruder in self._global_container_stack.extruders.items(): - if extruder.isEnabled and not extruder.material.getMetaDataEntry("compatible"): - return False + if not extruder.isEnabled: + continue if not extruder.material.getMetaDataEntry("compatible"): return False return True