[pacman-dev] [PATCH] Rework callback message to add translation

Allan McRae allan at archlinux.org
Mon Apr 8 22:00:17 EDT 2013


Signed-off-by: Allan McRae <allan at archlinux.org>
---
 src/pacman/callback.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/pacman/callback.c b/src/pacman/callback.c
index 71d9d04..12c80d3 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;
 	}
-- 
1.8.2



More information about the pacman-dev mailing list