@@ -170,11 +170,12 @@ class InstallOptions1Dialog(GUIObject):
return True
- def _get_sw_needs_text(self, required_space):
+ def _get_sw_needs_text(self, required_space, auto_swap):
required_space_text = size_str(required_space)
sw_text = (_("Your current <a
href=\"\"><b>%s</b> software selection</a> requires "
- "<b>%s</b> of available space.")
- % (productName, required_space_text))
+ "<b>%s</b> of available space, including
<b>%s</b> for "
+ "software and <b>%s</b> for swap space.")
+ % (productName, required_space + auto_swap, required_space,
auto_swap))
return sw_text
# Methods to handle sensitivity of the modify button.
It should have been this way for starters, but with three string
substitutions we should definitely be doing the dictionary style now.
Otherwise translators are going to have fits with this.
@@ -252,9 +253,9 @@ class
InstallOptions3Dialog(InstallOptions1Dialog):
builderObjects = ["options3_dialog"]
mainWidgetName = "options3_dialog"
- def refresh(self, required_space, disk_free, fs_free, autoPartType, encrypted):
+ def refresh(self, required_space, auto_swap, disk_free, fs_free, autoPartType,
encrypted):
sw_text = self._get_sw_needs_text(required_space)
- label_text = (_("%s\nYou don't have enough space available to install
"
+ label_text = (_("%s You don't have enough space available to install
"
"<b>%s</b>, even if you used all of the free
space\n"
"available on the selected disks.")
% (sw_text, productName))
Likewise.
- Chris