diff options
| author | David Shaw <[email protected]> | 2004-10-07 21:14:31 +0000 |
|---|---|---|
| committer | David Shaw <[email protected]> | 2004-10-07 21:14:31 +0000 |
| commit | 4737923d564bc24870432bcf53542ba87f70068b (patch) | |
| tree | efea59c699ecc30d0890e5ce01ed02a99ef26969 /g10/pkclist.c | |
| parent | * helptext.c, pkclist.c (do_we_trust): It is not possible to get here with (diff) | |
| download | gnupg-4737923d564bc24870432bcf53542ba87f70068b.tar.gz gnupg-4737923d564bc24870432bcf53542ba87f70068b.zip | |
* pkclist.c (build_pk_list): Keystrify.
* mainproc.c (check_sig_and_print), pkclist.c (do_edit_ownertrust):
Improve translatability of user ID prompts.
Diffstat (limited to 'g10/pkclist.c')
| -rw-r--r-- | g10/pkclist.c | 19 |
1 files changed, 8 insertions, 11 deletions
diff --git a/g10/pkclist.c b/g10/pkclist.c index 5f4e30436..e8e0b86ae 100644 --- a/g10/pkclist.c +++ b/g10/pkclist.c @@ -171,7 +171,6 @@ do_edit_ownertrust (PKT_public_key *pk, int mode, unsigned *new_trust, int defer_help ) { char *p; - size_t n; u32 keyid[2]; int changed=0; int quit=0; @@ -204,11 +203,9 @@ do_edit_ownertrust (PKT_public_key *pk, int mode, tty_printf("%4u%c/%s %s\n",nbits_from_pk( pk ), pubkey_letter( pk->pubkey_algo ), keystr(keyid), datestr_from_pk( pk ) ); - tty_printf(_(" \"")); - p = get_user_id( keyid, &n ); - tty_print_utf8_string( p, n ); + p=get_user_id_native(keyid); + tty_printf(_(" \"%s\"\n"),p); m_free(p); - tty_printf("\"\n"); keyblock = get_pubkeyblock (keyid); if (!keyblock) @@ -231,10 +228,10 @@ do_edit_ownertrust (PKT_public_key *pk, int mode, show_photos(un->pkt->pkt.user_id->attribs, un->pkt->pkt.user_id->numattribs,pk,NULL); - tty_printf(_(" aka \"")); - tty_print_utf8_string (un->pkt->pkt.user_id->name, - un->pkt->pkt.user_id->len ); - tty_printf("\"\n"); + p=utf8_to_native(un->pkt->pkt.user_id->name, + un->pkt->pkt.user_id->len,0); + + tty_printf(_(" aka \"%s\"\n"),p); } print_fingerprint (pk, NULL, 2); @@ -785,10 +782,10 @@ build_pk_list( STRLIST rcpts, PK_LIST *ret_pk_list, unsigned use ) u32 keyid[2]; keyid_from_pk(iter->pk,keyid); - tty_printf("%4u%c/%08lX %s \"", + tty_printf("%4u%c/%s %s \"", nbits_from_pk(iter->pk), pubkey_letter(iter->pk->pubkey_algo), - (ulong)keyid[1], + keystr(keyid), datestr_from_pk(iter->pk)); if(iter->pk->user_id) |