X-Git-Url: https://git.deb.at/?a=blobdiff_plain;f=abook.c;h=afd3eaebcc4c17201629d2e3de02f5cd05a00081;hb=2f465ba5e73ba05745d23f0fca9d5bdb1b350d8c;hp=c2367bbec44bf18c76986fa0df9086c48eae4124;hpb=a1bba6c6aa1c73bd8e6423008dd89c35fec23f6b;p=pkg%2Fabook.git

diff --git a/abook.c b/abook.c
index c2367bb..afd3eae 100644
--- a/abook.c
+++ b/abook.c
@@ -8,6 +8,7 @@
 
 #include <errno.h>
 #include <fcntl.h>
+#include <ctype.h>
 #include <signal.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -134,7 +135,7 @@ init_abook()
 	umask(DEFAULT_UMASK);
 
 	if(!datafile_writeable()) {
-		char *s = mkstr(_("File %s is not writeable"), datafile);
+		char *s = strdup_printf(_("File %s is not writeable"), datafile);
 		refresh_screen();
 		statusline_msg(s);
 		free(s);
@@ -407,7 +408,7 @@ show_usage()
 		"add the sender to the addressbook"));
 	puts	(_("	--add-email-quiet		"
 		"same as --add-email but doesn't\n"
-		"					confirm adding"));
+		"					require to confirm adding"));
 	putchar('\n');
 	puts	(_("	--convert			convert address book files"));
 	puts	(_("	options to use with --convert:"));
@@ -502,12 +503,12 @@ make_mailstr(int item)
 {
 	char email[MAX_EMAIL_LEN];
 	char *ret;
-	char *name = mkstr("\"%s\"", database[item][NAME]);
+	char *name = strdup_printf("\"%s\"", database[item][NAME]);
 
 	get_first_email(email, item);
 
 	ret = *database[item][EMAIL] ?
-		mkstr("%s <%s>", name, email) :
+		strdup_printf("%s <%s>", name, email) :
 		xstrdup(name);
 
 	free(name);
@@ -577,7 +578,7 @@ launch_wwwbrowser(int item)
 		return;
 
 	if( database[item][URL] )
-		cmd = mkstr("%s '%s'",
+		cmd = strdup_printf("%s '%s'",
 				opt_get_str(STR_WWW_COMMAND),
 				safe_str(database[item][URL]));
 	else
@@ -736,17 +737,18 @@ add_email_add_item(int quiet, char *name, char *email)
 		}
 
 		do {
-			/* TODO gettext: handle translated keypresses? */
-			printf(_("Add ``%s <%s>'' to %s ? (y/n)\n"),
+			printf(_("Add \"%s <%s>\" to %s? (%c/%c)\n"),
 					name,
 					email,
-					datafile);
-			c = getc(in);
-			if(c == 'n' || c == 'N') {
+					datafile,
+					*S_("keybinding for yes|y"),
+					*S_("keybinding for no|n"));
+			c = tolower(getc(in));
+			if(c == *S_("keybinding for no|n")) {
 				fclose(in);
 				return 0;
 			}
-		} while(c != 'y' && c != 'Y');
+		} while(c != *S_("keybinding for yes|y"));
 		fclose(in);
 	}