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

[Devin Teske]

Author: dteske
Date: Tue Dec 13 00:22:01 2016
New Revision: 309961
URL: https://svnweb.freebsd.org/changeset/base/309961

Log:
  Stop repeating strings (centralize prompt string)
  NB: Changes to strings now only affect a single line

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

Modified: head/usr.sbin/bsdinstall/scripts/wlanconfig
==============================================================================
--- head/usr.sbin/bsdinstall/scripts/wlanconfig	Tue Dec 13 00:18:51 2016	(r309960)
+++ head/usr.sbin/bsdinstall/scripts/wlanconfig	Tue Dec 13 00:22:01 2016	(r309961)
@@ -85,7 +85,7 @@ country_set()
 
 dialog_country_select()
 {
-	local input regdomains countries regdomain country
+	local input regdomains countries regdomain country prompt
 	local no_default="<not selected>"
 	local default_regdomain="${1:-$no_default}"
 	local default_country="${2:-$no_default}"
@@ -111,8 +111,9 @@ dialog_country_select()
 	' | sort )
 
 	f_dialog_title "Regdomain selection"
+	prompt="Select your regdomain."
 	f_dialog_menu_size height width rows "$DIALOG_TITLE" \
-		"$DIALOG_BACKTITLE" "Select your regdomain." "" $regdomains
+		"$DIALOG_BACKTITLE" "$prompt" "" $regdomains
 	regdomain=$( sh -c "$DIALOG \
 		--title \"$DIALOG_TITLE\" \
 		--backtitle \"$DIALOG_BACKTITLE\" \
@@ -120,20 +121,21 @@ dialog_country_select()
 		--default-item \"$default_regdomain\" \
 		--no-items \
 		--stdout \
-		--menu \"Select your regdomain.\" \
+		--menu \"$prompt\" \
 		$height $width $rows $regdomains"
 	)
 
 	f_dialog_title "Country selection"
+	prompt="Select your country."
 	eval f_dialog_menu_size height width rows \
 		\"\$DIALOG_TITLE\" \"\$DIALOG_BACKTITLE\" \
-		\"Select your country.\" \"\" $countries
+		\"\$prompt\" \"\" $countries
 	country=$( eval $DIALOG \
 		--title \"\$DIALOG_TITLE\" \
 		--backtitle \"\$DIALOG_BACKTITLE\" \
 		--cancel-label \"\$msg_skip\" \
 		--default-item \"\$default_country\" \
-		--menu \"Select your country.\" \
+		--menu \"\$prompt\" \
 		$height $width $rows \
 		$countries \
 		2>&1 >&$DIALOG_TERMINAL_PASSTHRU_FD