svn commit: r266109 - head/usr.sbin/bsdinstall/scripts

[Ollivier Robert]

Author: roberto
Date: Thu May 15 02:37:59 2014
New Revision: 266109
URL: http://svnweb.freebsd.org/changeset/base/266109

Log:
  Fix the "disks" variable reuse.
  
  It starts off being used to track the grammar for the number of disks
  (singular vs plural) and then it is reused as the list of available disks.
  
  Replace the variable with disks_grammar and move 'disk' and 'disks' to
  msg_ vars so they can be translated in the future.
  
  Submitted by:	Allan Jude <freebsd at allanjude.com>
  Reviewed by:	roberto
  MFC after:		2 weeks
  Sponsored by:	ScaleEngine Inc.

Modified:
  head/usr.sbin/bsdinstall/scripts/zfsboot

Modified: head/usr.sbin/bsdinstall/scripts/zfsboot
==============================================================================
--- head/usr.sbin/bsdinstall/scripts/zfsboot	Thu May 15 02:31:02 2014	(r266108)
+++ head/usr.sbin/bsdinstall/scripts/zfsboot	Thu May 15 02:37:59 2014	(r266109)
@@ -220,6 +220,8 @@ msg_configure_options="Configure Options
 msg_detailed_disk_info="gpart(8) show %s:\n%s\n\ncamcontrol(8) inquiry %s:\n%s\n\n\ncamcontrol(8) identify %s:\n%s\n"
 msg_disk_info="Disk Info"
 msg_disk_info_help="Get detailed information on disk device(s)"
+msg_disk_singular="disk"
+msg_disk_plural="disks"
 msg_encrypt_disks="Encrypt Disks?"
 msg_encrypt_disks_help="Use geli(8) to encrypt all data partitions"
 msg_error="Error"
@@ -306,13 +308,14 @@ dialog_menu_main()
 	[ "$ZFSBOOT_GELI_ENCRYPTION" ] && usegeli="$msg_yes"
 	[ "$ZFSBOOT_SWAP_ENCRYPTION" ] && swapgeli="$msg_yes"
 	[ "$ZFSBOOT_SWAP_MIRROR" ] && swapmirror="$msg_yes"
-	local disks n
+	local disks n disks_grammar
 	f_count n $ZFSBOOT_DISKS
-	{ [ $n -eq 1 ] && disks=disk; } || disks=disks # grammar
+	{ [ $n -eq 1 ] && disks_grammar=$msg_disk_singular; } || 
+		disks_grammar=$msg_disk_plural # grammar
 	local menu_list="
 		'>>> $msg_install'        '$msg_install_desc'
 		                          '$msg_install_help'
-		'T $msg_pool_type_disks'  '$ZFSBOOT_VDEV_TYPE: $n $disks'
+		'T $msg_pool_type_disks'  '$ZFSBOOT_VDEV_TYPE: $n $disks_grammar'
                                           '$msg_pool_type_disks_help'
 		'- $msg_rescan_devices'   '*'
 		                          '$msg_rescan_devices_help'