Author: aschnell Date: Mon Sep 1 12:43:55 2008 New Revision: 50513 URL: http://svn.opensuse.org/viewcvs/yast?rev=50513&view=rev Log: - work on helptexts Modified: trunk/storage/storage/src/modules/StorageFields.ycp Modified: trunk/storage/storage/src/modules/StorageFields.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/modules/StorageFields.ycp?rev=50513&r1=50512&r2=50513&view=diff ============================================================================== --- trunk/storage/storage/src/modules/StorageFields.ycp (original) +++ trunk/storage/storage/src/modules/StorageFields.ycp Mon Sep 1 12:43:55 2008 @@ -203,52 +203,201 @@ switch (field) { - case `device: - ret = ret + "<b>Device</b> tells the kernel name of the device."; + case `bios_id: + // helptext for table column and overview entry + ret = ret + _("<b>BIOS ID</b> shows the BIOS ID of the hard +disk. This field can be empty."); + break; + + case `bus: + // helptext for table column and overview entry + ret = ret + _("<b>Bus</b> shows how the device is connected to +the system. This field can be empty, e.g. for multipath disks."); break; case `chunk_size: - ret = ret + "<b>Chunk Size</b> tells the chunk size for RAID devices."; + // helptext for table column and overview entry + ret = ret + _("<b>Chunk Size</b> shows the chunk size for RAID +devices."); + break; + + case `cyl_size: + // helptext for table column and overview entry + ret = ret + _("<b>Cylinder Size</b> shows the size of the +cylinders of the hard disk."); + break; + + case `device: + // helptext for table column and overview entry + ret = ret + _("<b>Device</b> shows the kernel name of the +device."); + break; + + case `disk_label: + // helptext for table column and overview entry + ret = ret + _("<b>Disk Label</b> shows the partition table +type of the disk, e.g <tt>MSDOS</tt> or <tt>GPT</tt>."); + break; + + case `encrypted: + // helptext for table column and overview entry + // TODO + break; + + case `end_cyl: + // helptext for table column and overview entry + ret = ret + _("<b>End Cylinder</b> shows the end cylinder of +the partition."); + break; + + case `fc_fcp_lun: + // helptext for table column and overview entry + ret = ret + _("<b>LUN</b> shows the Logical Unit Number for +Fibre Channel disks."); + break; + + case `fc_port_id: + // helptext for table column and overview entry + ret = ret + _("<b>Port ID</b> shows the port id for Fibre +Channel disks."); + break; + + case `fc_wwpn: + // helptext for table column and overview entry + ret = ret + _("<b>WWPN</b> shows the World Wide Port Name for +Fibre Channel disks."); + break; + + case `file_path: + // helptext for table column and overview entry + // TODO + break; + + case `format: + // helptext for table column and overview entry + ret = ret + _("<b>Format</b> shows some flags: <tt>C</tt> +means the partition is encrypted. <tt>F</tt> means the partition is selected +to be formatted."); + break; + + case `fs_id: + // helptext for table column and overview entry + // TODO + break; + + case `fs_type: + // helptext for table column and overview entry + // TODO + break; + + case `label: + // helptext for table column and overview entry + ret = ret + _("<b>Label</b> shows the label of the file +system."); + break; + + case `lvm_metadata: + // helptext for table column and overview entry + // TODO + break; + + case `model: + // helptext for table column and overview entry + ret = ret + _("<b>Model</b> shows the device model."); break; case `mount_by: - // description of a table column or overview entry - ret = ret + "<b>Mount By</b> indicates how the file system is -mounted: (Kernel) by Kernel Name, (Label) by File System Label, (UUID) by File -System UUID, (ID) by Device ID, and (Path) by Device Path."; + // helptext for table column and overview entry + ret = ret + _("<b>Mount By</b> indicates how the file system +is mounted: (Kernel) by Kernel Name, (Label) by File System Label, (UUID) by +File System UUID, (ID) by Device ID, and (Path) by Device Path."); break; case `mount_point: - // description of a table column or overview entry - ret = ret + "<b>Mount Point</b> shows where the file system is -or will be mounted."; - + // helptext for table column and overview entry + ret = ret + _("<b>Mount Point</b> shows where the file system +is mounted."); if (Mode::normal() || true) - // description of a table column or overview entry - ret = ret + " " + "An asterisk (*) after the mount point + // helptext for table column and overview entry + ret = ret + " " + _("An asterisk (*) after the mount point indicates a file system that is currently not mounted (for example, because it -has the <tt>noauto</tt> option set in <tt>/etc/fstab</tt>)."; +has the <tt>noauto</tt> option set in <tt>/etc/fstab</tt>)."); + break; + + case `num_cyl: + // helptext for table column and overview entry + ret = ret + _("<b>Number of Cylinders</b> shows how many +cylinders the hard disk has."); break; case `parity_algorithm: - ret = ret + "<b>Parity Algorithm</b> tells the parity -algorithm for RAID devices with RAID type 5."; + // helptext for table column and overview entry + ret = ret + _("<b>Parity Algorithm</b> shows the parity +algorithm for RAID devices with RAID type 5."); + break; + + case `pe_size: + // helptext for table column and overview entry + ret = ret + _("<b>PE Size</b> shows the physical extend size +for LVM volume groups."); break; case `raid_type: - ret = ret + "<b>RAID Type</b> tells the RAID type, also called -RAID level, for RAID devices."; + // helptext for table column and overview entry + ret = ret + _("<b>RAID Type</b> shows the RAID type, also +called RAID level, for RAID devices."); break; case `size: - ret = ret + "<b>Size</b> tells the size of the device."; + // helptext for table column and overview entry + ret = ret + _("<b>Size</b> shows the size of the device."); + break; + + case `start_cyl: + // helptext for table column and overview entry + ret = ret + _("<b>Start Cylinder</b> shows the start cylinder +of the partition."); + break; + + case `stripes: + // helptext for table column and overview entry + ret = ret + _("<b>Stripes</b> shows the stripe number for LVM +logical volumes and, if greater than one, in parenthesise the stripe size."); + break; + + case `type: + // helptext for table column and overview entry + // TODO + break; + + case `udev_id: + // helptext for table column and overview entry + ret = ret + _("<b>Device Id</b> shows the persistent device +ids. This field can be empty."); + break; + + case `udev_path: + // helptext for table column and overview entry + ret = ret + _("<b>Device Path</b> shows the persistent device +path. This field can be empty."); break; case `used_by: - // description of a table column or overview entry - ret = ret + "<b>Used By</b> tells if a device is used by + // helptext for table column and overview entry + ret = ret + _("<b>Used By</b> shows if a device is used by e.g. RAID or LVM. If you do not use such things, it is perfectly normal for -this column to be empty."; +this column to be empty."); + break; + + case `uuid: + // helptext for table column and overview entry + ret = ret + _("<b>UUID</b> shows the Universally Unique +Identifier of the file system."); + break; + + case `vendor: + // helptext for table column and overview entry + ret = ret + _("<b>Vendor</b> shows the device vendor."); break; default: @@ -431,7 +580,7 @@ if (style == `table) return value; else - return sformat(_("Path: %1"), value); + return sformat(_("Device Path: %1"), value); } case `udev_id: @@ -441,7 +590,7 @@ } else { integer n = size(data["udev_id"]:[]); return mergestring(maplist(integer i, Integer::Range(n == 0 ? 1 : n), { - return sformat(_("ID %1: %2"), i+1, data["udev_id", i]:""); + return sformat(_("Device ID %1: %2"), i+1, data["udev_id", i]:""); }), HTML::Newline()); } } @@ -510,7 +659,7 @@ if (style == `table) return value; else - return sformat(_("Physical Extent Size: %1"), value); + return sformat(_("PE Size: %1"), value); } case `stripes: @@ -871,6 +1020,8 @@ global string TableHelptext(list<symbol> fields) { + fields = filter(symbol field, fields, { return substring(tostring(field), 0, 8) != "`heading"; }); + string initial = "<p>The table contains:</p>"; string helptext = list::reduce(string tmp, symbol field, initial, fields, { -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org