27c27
< # $FreeBSD: head/usr.sbin/bsdconfig/share/packages/packages.subr 250323 2013-05-07 05:40:20Z dteske $
---
> # $FreeBSD: head/usr.sbin/bsdconfig/share/packages/packages.subr 250538 2013-05-12 00:46:18Z dteske $
81d80
< f_str2varname "${cat# }" varcat
83,84c82,83
< # Add an asterisk to the category if its index has been cached
< f_isset _index_page_${varcat}_1 && cat="$cat*"
---
> cat="${cat# }" # Trim leading space inserted by sort-method
> f_str2varname "$cat" varcat
88,89c87,91
< debug= f_getvar "_${varcat}_ninstalled" n &&
< [ $n -ge 1 ] && desc="$desc; $n installed"
---
> case "$cat" in
> "$msg_all") debug= f_getvar "_All_ninstalled" n ;;
> *) debug= f_getvar "_${varcat}_ninstalled" n ;;
> esac &&
> [ $n -ge 1 ] && desc="$desc; $n $msg_installed_lc"
93,94c95,99
< debug= f_getvar "_${varcat}_nselected" n &&
< [ $n -ge 1 ] && desc="$desc; $n selected"
---
> case "$cat" in
> "$msg_all") debug= f_getvar "_All_nselected" n ;;
> *) debug= f_getvar "_${varcat}_nselected" n ;;
> esac &&
> [ $n -ge 1 ] && desc="$desc; $n $msg_selected"
95a101,103
> # Add an asterisk to the category if its index has been cached
> f_isset _index_page_${varcat}_1 && cat="$cat*"
>
368c376
< "All"|"") npkgs="${_npkgs:-0}";;
---
> "$msg_all"|"") npkgs="${_npkgs:-0}";;
440c448,453
< f_category_desc_get "$category" prompt
---
> # Accept/Translate i18n "All" but other category names must
> # match tree definitions from INDEX, ports, FTP, etc.
> case "$category" in
> "$msg_all"|"") f_category_desc_get "All" prompt ;;
> *) f_category_desc_get "$category" prompt ;;
> esac
< # $FreeBSD: head/usr.sbin/bsdconfig/share/packages/packages.subr 250323 2013-05-07 05:40:20Z dteske $
---
> # $FreeBSD: head/usr.sbin/bsdconfig/share/packages/packages.subr 250538 2013-05-12 00:46:18Z dteske $
81d80
< f_str2varname "${cat# }" varcat
83,84c82,83
< # Add an asterisk to the category if its index has been cached
< f_isset _index_page_${varcat}_1 && cat="$cat*"
---
> cat="${cat# }" # Trim leading space inserted by sort-method
> f_str2varname "$cat" varcat
88,89c87,91
< debug= f_getvar "_${varcat}_ninstalled" n &&
< [ $n -ge 1 ] && desc="$desc; $n installed"
---
> case "$cat" in
> "$msg_all") debug= f_getvar "_All_ninstalled" n ;;
> *) debug= f_getvar "_${varcat}_ninstalled" n ;;
> esac &&
> [ $n -ge 1 ] && desc="$desc; $n $msg_installed_lc"
93,94c95,99
< debug= f_getvar "_${varcat}_nselected" n &&
< [ $n -ge 1 ] && desc="$desc; $n selected"
---
> case "$cat" in
> "$msg_all") debug= f_getvar "_All_nselected" n ;;
> *) debug= f_getvar "_${varcat}_nselected" n ;;
> esac &&
> [ $n -ge 1 ] && desc="$desc; $n $msg_selected"
95a101,103
> # Add an asterisk to the category if its index has been cached
> f_isset _index_page_${varcat}_1 && cat="$cat*"
>
368c376
< "All"|"") npkgs="${_npkgs:-0}";;
---
> "$msg_all"|"") npkgs="${_npkgs:-0}";;
440c448,453
< f_category_desc_get "$category" prompt
---
> # Accept/Translate i18n "All" but other category names must
> # match tree definitions from INDEX, ports, FTP, etc.
> case "$category" in
> "$msg_all"|"") f_category_desc_get "All" prompt ;;
> *) f_category_desc_get "$category" prompt ;;
> esac