Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAllan McRae <allan@archlinux.org>2013-04-09 11:59:43 +1000
committerAllan McRae <allan@archlinux.org>2013-04-11 10:53:52 +1000
commit3de8f8f1ccf103ae9737299b52407b4ebe51d75a (patch)
tree1aa08d9a573befd7962b1cc79437cc5bbcaf06b0
parent32c91e28952f3b746da7513849a8f3c996aab807 (diff)
Rework callback message to add translation
Signed-off-by: Allan McRae <allan@archlinux.org>
-rw-r--r--src/pacman/callback.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/pacman/callback.c b/src/pacman/callback.c
index 71d9d04d..12c80d36 100644
--- a/src/pacman/callback.c
+++ b/src/pacman/callback.c
@@ -396,16 +396,16 @@ void cb_question(alpm_question_t event, void *data1, void *data2,
{
alpm_pgpkey_t *key = data1;
char created[12];
- const char *revoked = "";
time_t time = (time_t)key->created;
strftime(created, 12, "%Y-%m-%d", localtime(&time));
if(key->revoked) {
- revoked = " (revoked)";
+ *response = yesno(_("Import PGP key %d%c/%s, \"%s\", created: %s (revoked)?"),
+ key->length, key->pubkey_algo, key->fingerprint, key->uid, created);
+ } else {
+ *response = yesno(_("Import PGP key %d%c/%s, \"%s\", created: %s?"),
+ key->length, key->pubkey_algo, key->fingerprint, key->uid, created);
}
-
- *response = yesno(_("Import PGP key %d%c/%s, \"%s\", created: %s%s?"),
- key->length, key->pubkey_algo, key->fingerprint, key->uid, created, revoked);
}
break;
}