Author: aschnell
Date: Tue Sep 2 15:03:41 2008
New Revision: 50570
URL: http://svn.opensuse.org/viewcvs/yast?rev=50570&view=rev
Log:
- work on messages
Modified:
trunk/storage/storage/src/include/ep-hd-dialogs.ycp
Modified: trunk/storage/storage/src/include/ep-hd-dialogs.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/ep-hd-dialogs.ycp?rev=50570&r1=50569&r2=50570&view=diff
==============================================================================
--- trunk/storage/storage/src/include/ep-hd-dialogs.ycp (original)
+++ trunk/storage/storage/src/include/ep-hd-dialogs.ycp Tue Sep 2 15:03:41 2008
@@ -9,6 +9,15 @@
textdomain "storage";
+ string MiniWorkflowStepPartitionTypeHelptext()
+ {
+ // helptext
+ string helptext = _("<p>Choose the partition type for the new partition.</p>");
+
+ return helptext;
+ }
+
+
symbol MiniWorkflowStepPartitionType(map &data)
{
y2milestone("MiniWorkflowStepPartitionType data:%1", data);
@@ -34,7 +43,7 @@
term contents = `HVSquash(`Frame(_("Partition Type"),
`RadioButtonGroup(`id(`partition_type), tmp)));
- MiniWorkflow::SetContents(Greasemonkey::Transform(contents), "TODO");
+ MiniWorkflow::SetContents(Greasemonkey::Transform(contents), MiniWorkflowStepPartitionTypeHelptext());
MiniWorkflow::SetLastStep(false);
symbol widget = nil;
@@ -72,6 +81,15 @@
}
+ string MiniWorkflowStepPartitionSizeHelptext()
+ {
+ // helptext
+ string helptext = _("<p>Choose the size for the new partition.</p>");
+
+ return helptext;
+ }
+
+
symbol MiniWorkflowStepPartitionSize(map &data)
{
y2milestone("MiniWorkflowStepPartitionSize data:%1", data);
@@ -88,11 +106,14 @@
symbol what = (region == slot) ? `max_size : `manual_size;
term contents = `HVSquash(
+ // frame heading
`Frame(_("Size"),
`RadioButtonGroup(`id(`size),
`VBox(
`LeftRadioButton(`id(`max_size), `opt(`notify),
+ // radio button text, %1 is replaced by size
sformat(_("Maximum Size (%1)"), Storage::KByteToHumanString(max_size_k))),
+ // radio button text
`LeftRadioButtonWithAttachment(`id(`manual_size), `opt(`notify), _("Manual Size"),
`VBox(`id(`manual_size_attachment),
`MinWidth(15, `InputField(`id(`size_input), `opt(`shrinkable), _("Size")))
@@ -101,7 +122,7 @@
)
)));
- MiniWorkflow::SetContents(Greasemonkey::Transform(contents), "TODO help");
+ MiniWorkflow::SetContents(Greasemonkey::Transform(contents), MiniWorkflowStepPartitionSizeHelptext());
MiniWorkflow::SetLastStep(data["type"]:`unknown == `extended);
UI::ChangeWidget(`id(`size), `Value, what);
@@ -132,13 +153,15 @@
string tmp = (string) UI::QueryWidget(`id(`size_input), `Value);
if (!Storage::HumanStringToKByte(tmp, size_k))
{
+ // error popup, %1 and %2 are replaced by sizes
Popup::Error(sformat(_("The size entered is invalid. Enter a value like \"%1\" or \"%2\"."),
- Storage::KByteToHumanString(500*1024),
+ Storage::KByteToHumanString(500*1024),
Storage::KByteToHumanString(1024*1024)));
widget = `again;
}
else if (size_k < min_size_k || size_k > max_size_k)
{
+ // error popup, %1 and %2 are replaced by sizes
Popup::Error(sformat(_("The size entered is invalid. Enter a size between %1 and %2."),
Storage::KByteToHumanString(min_size_k),
Storage::KByteToHumanString(max_size_k)));
@@ -216,6 +239,7 @@
data["device"] = r["device"]:"";
}
+ // dialog title
string title = sformat(_("Add Partition on %1"), data["disk_device"]:"error");
symbol widget = MiniWorkflow::Run(title, hd_part_icon, aliases, sequence, start);
@@ -239,6 +263,7 @@
"Password" : $[ `finish : `finish ]
];
+ // dialog title
string title = sformat(_("Edit Partition %1"), device);
symbol widget = MiniWorkflow::Run(title, hd_part_icon, aliases, sequence, "FormatMount");
--
To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org
For additional commands, e-mail: yast-commit+help@opensuse.org