[PATCH 5/5] Have mountpoint descriptions defined in a dictionary

Chris Lumens clumens at redhat.com
Thu Apr 3 14:06:45 UTC 2014


> @@ -1218,7 +1209,8 @@ class CustomPartitioningSpoke(NormalSpoke, StorageChecker):
>          log.debug("updated device_container_size to %s", self._device_container_size)
>  
>          self._selectedDeviceLabel.set_text(selector.props.name)
> -        self._selectedDeviceDescLabel.set_text(self._description(selector.props.name))
> +        desc = _(MOUNTPOINT_DESCRIPTIONS.get(selector.props.name, ""))
> +        self._selectedDeviceDescLabel.set_text(desc)
>  
>          device_name = getattr(use_dev, "lvname", use_dev.name)
>          self._nameEntry.set_text(device_name)
> @@ -2074,7 +2066,8 @@ class CustomPartitioningSpoke(NormalSpoke, StorageChecker):
>  
>          if no_edit:
>              selectedDeviceLabel.set_text(selector.device.name)
> -            selectedDeviceDescLabel.set_text(self._description(selector.device.type))
> +            desc = _(MOUNTPOINT_DESCRIPTIONS.get(selector.device.type, ""))
> +            selectedDeviceDescLabel.set_text(desc)
>              selector.set_chosen(True)
>              self._current_selector = selector
>              self._configButton.set_sensitive(False)

Did you test what happens if you are using non-English and a mount point
that's not found in MOUNTPOINT_DESCRIPTIONS?  Because _("") is how we
end up with crazy stuff like what 6538af78414441c66aba8b968a26bad15b284570
fixed.

- Chris


More information about the anaconda-patches mailing list