---
pyanaconda/bootloader.py | 7 ++++---
pyanaconda/ui/gui/spokes/custom.py | 8 ++++----
2 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/pyanaconda/bootloader.py b/pyanaconda/bootloader.py
index 00644a7..10415e1 100644
--- a/pyanaconda/bootloader.py
+++ b/pyanaconda/bootloader.py
@@ -1582,9 +1582,10 @@ class GRUB2(GRUB):
for p in parts:
start = p.geometry.start * p.disk.device.sectorSize
if not p.getFlag(PARTITION_BIOS_GRUB) and start < 1024*512:
- msg = _("%s may not have enough space for grub2 to embed "
- "core.img when using the %s filesystem on %s") \
- % (self.stage1_device.name, self.stage2_device.format.type,
self.stage2_device.type)
+ msg = _("%(deviceName)s may not have enough space for grub2 to embed
"
+ "core.img when using the %(fsType)s filesystem on
%(deviceType)s") \
+ % {"deviceName": self.stage1_device.name,
"fsType": self.stage2_device.format.type,
+ "deviceType": self.stage2_device.type}
log.error(msg)
self.errors.append(msg)
ret = False
diff --git a/pyanaconda/ui/gui/spokes/custom.py b/pyanaconda/ui/gui/spokes/custom.py
index 70c77c8..95a4398 100644
--- a/pyanaconda/ui/gui/spokes/custom.py
+++ b/pyanaconda/ui/gui/spokes/custom.py
@@ -2166,15 +2166,15 @@ class CustomPartitioningSpoke(NormalSpoke, StorageChecker):
if selector._device.type == "mdarray":
total = selector._device.memberDevices
missing = total - len(selector._device.parents)
- txt = _("This Software RAID array is missing %d of %d member "
+ txt = _("This Software RAID array is missing %(missingMembers)d of
%(totalMembers)d member "
"partitions. You can remove it or select a different "
- "device.") % (missing, total)
+ "device.") % {"missingMembers": missing,
"totalMembers": total}
else:
total = selector._device.pvCount
missing = total - len(selector._device.parents)
- txt = _("This LVM Volume Group is missing %d of %d physical "
+ txt = _("This LVM Volume Group is missing %(missingPVs)d of
%(totalPVs)d physical "
"volumes. You can remove it or select a different "
- "device.") % (missing, total)
+ "device.") % {"missingPVs": missing,
"totalPVs": total}
optionsLabel.set_text(txt)
no_edit = True
elif getDeviceType(selector._device) is None:
--
1.7.11.2