From 3f8029af92752c04a55c67fb8948782d3f96e986 Mon Sep 17 00:00:00 2001 From: Allan McRae Date: Fri, 23 Dec 2022 16:41:17 +1000 Subject: [PATCH] pacman-key: Use ngettext for plurals There are two strings that may be singular or plural in pacman-key. Use ngettext to handle these strings correctly, and provide a fallback function if it is not available. Fixes FS#70556. Signed-off-by: Allan McRae --- scripts/pacman-key.sh.in | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/scripts/pacman-key.sh.in b/scripts/pacman-key.sh.in index 2db40976..92922ae2 100644 --- a/scripts/pacman-key.sh.in +++ b/scripts/pacman-key.sh.in @@ -378,7 +378,7 @@ populate_keyring() { key_count=$((key_count+1)) done if (( key_count )); then - msg2 "$(gettext "Disabled %s keys.")" "${key_count}" + msg2 "$(ngettext "Disabled %s key." "Disabled %s keys." "${key_count}")" "${key_count}" fi fi } @@ -506,7 +506,7 @@ lsign_keys() { exit 1 fi if (( key_count )); then - msg2 "$(gettext "Locally signed %s keys.")" "${key_count}" + msg2 "$(ngettext "Locally signed %s key." "Locally signed %s keys." "${key_count}")" "${key_count}" fi } @@ -612,6 +612,16 @@ if ! type gettext &>/dev/null; then } fi +if ! type ngettext &>/dev/null; then + ngettext() { + if (( $3 == 1 )); then + echo "$1" + else + echo "$2" + done + } +fi + OPT_SHORT="adefhlruvV" OPT_LONG=('add' 'config:' 'delete' 'edit-key' 'export' 'finger' 'gpgdir:' 'help' 'import' 'import-trustdb' 'init' 'keyserver:' 'list-keys' 'list-sigs'