From owner-svn-src-all@freebsd.org Mon Dec 12 21:00:10 2016 Return-Path: Delivered-To: svn-src-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id A7AC7C7333D; Mon, 12 Dec 2016 21:00:10 +0000 (UTC) (envelope-from dteske@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 5B64BBAD; Mon, 12 Dec 2016 21:00:10 +0000 (UTC) (envelope-from dteske@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id uBCL09qY029476; Mon, 12 Dec 2016 21:00:09 GMT (envelope-from dteske@FreeBSD.org) Received: (from dteske@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id uBCL09N8029475; Mon, 12 Dec 2016 21:00:09 GMT (envelope-from dteske@FreeBSD.org) Message-Id: <201612122100.uBCL09N8029475@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: dteske set sender to dteske@FreeBSD.org using -f From: Devin Teske Date: Mon, 12 Dec 2016 21:00:09 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r309941 - head/usr.sbin/bsdinstall/scripts X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 12 Dec 2016 21:00:10 -0000 Author: dteske Date: Mon Dec 12 21:00:09 2016 New Revision: 309941 URL: https://svnweb.freebsd.org/changeset/base/309941 Log: Use provided API to centralize dialog title strings Modified: head/usr.sbin/bsdinstall/scripts/wlanconfig Modified: head/usr.sbin/bsdinstall/scripts/wlanconfig ============================================================================== --- head/usr.sbin/bsdinstall/scripts/wlanconfig Mon Dec 12 20:54:20 2016 (r309940) +++ head/usr.sbin/bsdinstall/scripts/wlanconfig Mon Dec 12 21:00:09 2016 (r309941) @@ -108,10 +108,11 @@ dialog_country_select() } }' | sort -k 2 | tr '\n' ' ' ) - f_dialog_menu_size height width rows "Regdomain selection" \ + f_dialog_title "Regdomain selection" + f_dialog_menu_size height width rows "$DIALOG_TITLE" \ "$DIALOG_BACKTITLE" "Select your regdomain." "" $regdomains regdomain=$( sh -c "$DIALOG \ - --title \"Regdomain selection\" \ + --title \"$DIALOG_TITLE\" \ --backtitle \"$DIALOG_BACKTITLE\" \ --cancel-label \"Skip\" \ --default-item \"$default_regdomain\" \ @@ -121,10 +122,11 @@ dialog_country_select() $height $width $rows $regdomains" ) - f_dialog_menu_size height width rows "Country selection" \ + f_dialog_title "Country selection" + f_dialog_menu_size height width rows "$DIALOG_TITLE" \ "$DIALOG_BACKTITLE" "Select your country." "" $countries country=$( sh -c "$DIALOG \ - --title \"Country selection\" \ + --title \"$DIALOG_TITLE\" \ --backtitle \"$DIALOG_BACKTITLE\" \ --cancel-label \"Skip\" \ --default-item \"$default_country\" \ @@ -181,8 +183,9 @@ if [ "$BSDINSTALL_CONFIGCURRENT" ]; then DEF_COUNTRY=$( echo $INPUT | cut -w -f 4 ) [ "$DEF_REGDOMAIN" = 0 ] && DEF_REGDOMAIN="" [ "$DEF_COUNTRY" = 0 ] && DEF_COUNTRY="" + f_dialog_title "Regdomain/country" $DIALOG \ - --title "Regdomain/country" \ + --title "$DIALOG_TITLE" \ --backtitle "$DIALOG_BACKTITLE" \ --yesno "Change regdomain/country (now $DEF_REGDOMAIN/$DEF_COUNTRY)?" \ 0 0 @@ -201,8 +204,9 @@ while :; do SCANSSID=0 output=$( wpa_cli scan 2>&1 ) f_dprintf "%s" "$output" + f_dialog_title "Scanning" $DIALOG \ - --title "Scanning" \ + --title "$DIALOG_TITLE" \ --backtitle "$DIALOG_BACKTITLE" \ --ok-label "Skip" \ --pause "Waiting 5 seconds to scan for wireless networks..." \ @@ -217,17 +221,19 @@ while :; do ' | sort | uniq ) if [ ! "$NETWORKS" ]; then + f_dialog_title "Error" $DIALOG \ - --title "Error" \ + --title "$DIALOG_TITLE" \ --backtitle "$DIALOG_BACKTITLE" \ --yesno "No wireless networks were found. Rescan?" \ 0 0 && continue exit 1 fi + f_dialog_title "Network Selection" exec 3>&1 NETWORK=$( sh -c "$DIALOG \ - --title \"Network Selection\" \ + --title \"$DIALOG_TITLE\" \ --backtitle \"$DIALOG_BACKTITLE\" \ --extra-button \ --extra-label \"Rescan\" \