From 0e86e60653cf58b976f4a8f73b31ce00bb60c0d0 Mon Sep 17 00:00:00 2001 From: Chris Allegretta Date: Thu, 23 Jan 2003 04:27:23 +0000 Subject: [PATCH] - Changed some translatable debug messages to use %s instead of the function name, and removed gettext from two strings that had no actual words in them that should be translated. Suggested originally by Christian Rose git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@1387 35c25a1d-7b9e-4130-9fde-d3aeb78583b8 --- ChangeLog | 6 ++++++ color.c | 4 ++-- files.c | 4 ++-- nano.c | 4 ++-- rcfile.c | 6 +++--- winio.c | 6 +++--- 6 files changed, 18 insertions(+), 12 deletions(-) diff --git a/ChangeLog b/ChangeLog index daffe0f6..143a38b6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,10 @@ CVS Code - +- General + - Changed some translatable debug messages to use %s + instead of the function name, and removed gettext from + two strings that had no actual words in them that + should be translated. Suggested originally by + Christian Rose. - nano.c: main() - Call load_file with arg 0 for insert, as we aren't really diff --git a/color.c b/color.c index 56f55236..e1188890 100644 --- a/color.c +++ b/color.c @@ -91,8 +91,8 @@ void do_colorinit(void) init_pair(tmpcolor->pairnum, tmpcolor->fg, background); #ifdef DEBUG - fprintf(stderr, _("Running init_pair() with fg = %d and bg = %d\n"), - tmpcolor->fg, tmpcolor->bg); + fprintf(stderr, _("Running %s with fg = %d and bg = %d\n"), + "init_pair()", tmpcolor->fg, tmpcolor->bg); #endif } } diff --git a/files.c b/files.c index 9b3d09ec..037dc8fa 100644 --- a/files.c +++ b/files.c @@ -697,12 +697,12 @@ void free_openfilestruct(openfilestruct *src) src = src->next; delete_opennode(src->prev); #ifdef DEBUG - fprintf(stderr, _("delete_opennode(): free'd a node, YAY!\n")); + fprintf(stderr, _("%s: free'd a node, YAY!\n"), "delete_opennode()"); #endif } delete_opennode(src); #ifdef DEBUG - fprintf(stderr, _("delete_opennode(): free'd last node.\n")); + fprintf(stderr, _("%s: free'd last node.\n"), "delete_opennode()"); #endif } } diff --git a/nano.c b/nano.c index b0e61005..37be37a7 100644 --- a/nano.c +++ b/nano.c @@ -557,12 +557,12 @@ void free_filestruct(filestruct *src) src = src->next; delete_node(src->prev); #ifdef DEBUG - fprintf(stderr, _("delete_node(): free'd a node, YAY!\n")); + fprintf(stderr, _("%s: free'd a node, YAY!\n"), "delete_node()"); #endif } delete_node(src); #ifdef DEBUG - fprintf(stderr, _("delete_node(): free'd last node.\n")); + fprintf(stderr, _("%s: free'd last node.\n"), "delete_node()"); #endif } } diff --git a/rcfile.c b/rcfile.c index 714f1df0..ac37ac87 100644 --- a/rcfile.c +++ b/rcfile.c @@ -448,7 +448,7 @@ void parse_rcfile(FILE *rcstream) if (*ptr == '#') { #ifdef DEBUG - fprintf(stderr, _("parse_rcfile: Read a comment\n")); + fprintf(stderr, _("%s: Read a comment\n"), "parse_rcfile()"); #endif continue; /* Skip past commented lines */ } @@ -483,8 +483,8 @@ void parse_rcfile(FILE *rcstream) for (i = 0; rcopts[i].name != NULL; i++) { if (!strcasecmp(option, rcopts[i].name)) { #ifdef DEBUG - fprintf(stderr, _("parse_rcfile: Parsing option %s\n"), - rcopts[i].name); + fprintf(stderr, _("%s: Parsing option %s\n"), + "parse_rcfile()", rcopts[i].name); #endif if (set == 1) { if (!strcasecmp(rcopts[i].name, "tabsize") diff --git a/winio.c b/winio.c index 04b1e38b..cca2e33e 100644 --- a/winio.c +++ b/winio.c @@ -1072,7 +1072,7 @@ void update_cursor(void) } #ifdef DEBUG - fprintf(stderr, _("current->data = \"%s\"\n"), current->data); + fprintf(stderr, "current->data = \"%s\"\n", current->data); #endif } @@ -1452,8 +1452,8 @@ int do_cursorpos(int constant) linepct = 100 * current->lineno / totlines; #ifdef DEBUG - fprintf(stderr, _("do_cursorpos: linepct = %f, bytepct = %f\n"), - linepct, bytepct); + fprintf(stderr, "%s: linepct = %f, bytepct = %f\n", + "do_cursorpos()", linepct, bytepct); #endif /* if constant is zero, display the position on the statusbar