security-and-privacy/gnupg
security-and-privacy
/
gnupg
mirror of git://git.gnupg.org/gnupg.git
1
0
Fork 0
Code Releases Activity

gpg: Avoid extra translation strings. 

* g10/keyedit.c (menu_expire): Use only one prompt.
--

The old code was anyway not fully i18n because it did not used
ngettext.  Further we ran into const char*/char* conflicts on Windows
where we use a different gettext implementation.

FWIW: A better pattern in the case of a static and a malloced string
w/o error return on malloc failure would be:

  const char *s;
  char *s_buf;
  s_buf = xtryasprintf ("%d foo", n);
  if (!s_buf)
    s = "several foo";
  else
    s = s_buf;
  bar (s);
  xfree (s_buf);
This commit is contained in:
Werner Koch 2015-11-27 18:23:33 +01:00
parent 436a154ea8
commit 686f31c3d5
No known key found for this signature in database
GPG Key ID: E3FDFF218E45B72B
1 changed files with 4 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
g10/keyedit.c
View File

@ -4003,22 +4003,10 @@ menu_expire (KBNODE pub_keyblock)
n1 = count_selected_keys (pub_keyblock);
if (n1 > 1)
{
char *s = xtryasprintf (_("Are you sure you want to change the"
" expiration time %d subkeys? (y/N) "), n1);
int s_need_free;
if (s)
s_need_free = 0;
else
{
s = _("Are you sure you want to change the"
" expiration time for multiple subkeys? (y/N) ");
s_need_free = 0;
}
rc = cpr_get_answer_is_yes ("keyedit.expire_multiple_subkeys.okay", s);
if (s_need_free)
xfree (s);
if (! rc)
if (!cpr_get_answer_is_yes
("keyedit.expire_multiple_subkeys.okay",
_("Are you sure you want to change the"
" expiration time for multiple subkeys? (y/N) ")))
return 0;
}
else if (n1)