diff --git a/src/bin/psql/create_help.pl b/src/bin/psql/create_help.pl index 216479f024..6cba6b0641 100644 --- a/src/bin/psql/create_help.pl +++ b/src/bin/psql/create_help.pl @@ -5,7 +5,7 @@ # # Copyright (c) 2000-2003, PostgreSQL Global Development Group # -# $Header: /cvsroot/pgsql/src/bin/psql/create_help.pl,v 1.8 2003/08/04 23:59:40 tgl Exp $ +# $Header: /cvsroot/pgsql/src/bin/psql/create_help.pl,v 1.9 2003/09/14 22:37:12 petere Exp $ ################################################################# # @@ -51,6 +51,8 @@ print OUT #ifndef $define #define $define +#define N_(x) (x) /* gettext noop */ + struct _helpStruct { char *cmd; /* the command name */ @@ -110,7 +112,7 @@ foreach $file (sort readdir DIR) { $cmdsynopsis =~ s/\n/\\n/g; $cmdsynopsis =~ s/\"/\\"/g; - print OUT " { \"$cmdname\",\n \"$cmddesc\",\n \"$cmdsynopsis\" },\n\n"; + print OUT " { \"$cmdname\",\n N_(\"$cmddesc\"),\n N_(\"$cmdsynopsis\") },\n\n"; $count++; } else { diff --git a/src/bin/psql/help.c b/src/bin/psql/help.c index f6e0f3961b..fd13e199dc 100644 --- a/src/bin/psql/help.c +++ b/src/bin/psql/help.c @@ -3,7 +3,7 @@ * * Copyright (c) 2000-2003, PostgreSQL Global Development Group * - * $Header: /cvsroot/pgsql/src/bin/psql/help.c,v 1.79 2003/09/11 16:22:42 momjian Exp $ + * $Header: /cvsroot/pgsql/src/bin/psql/help.c,v 1.80 2003/09/14 22:37:13 petere Exp $ */ #include "postgres_fe.h" #include "common.h" @@ -338,9 +338,11 @@ helpSQL(const char *topic, unsigned short int pager) { help_found = true; fprintf(output, _("Command: %s\n" - "Description: %s\n" - "Syntax:\n%s\n\n"), - QL_HELP[i].cmd, QL_HELP[i].help, QL_HELP[i].syntax); + "Description: %s\n" + "Syntax:\n%s\n\n"), + QL_HELP[i].cmd, + gettext(QL_HELP[i].help), + gettext(QL_HELP[i].syntax)); /* If we have an exact match, exit. Fixes \h SELECT */ if (strcasecmp(topic, QL_HELP[i].cmd) == 0) break; diff --git a/src/bin/psql/nls.mk b/src/bin/psql/nls.mk index 8bef386199..897a09cb1b 100644 --- a/src/bin/psql/nls.mk +++ b/src/bin/psql/nls.mk @@ -1,6 +1,6 @@ -# $Header: /cvsroot/pgsql/src/bin/psql/nls.mk,v 1.9 2003/08/24 21:18:52 petere Exp $ +# $Header: /cvsroot/pgsql/src/bin/psql/nls.mk,v 1.10 2003/09/14 22:37:13 petere Exp $ CATALOG_NAME := psql AVAIL_LANGUAGES := cs de es fr hu ru sv zh_CN zh_TW GETTEXT_FILES := command.c common.c copy.c help.c input.c large_obj.c \ - mainloop.c print.c startup.c describe.c -GETTEXT_TRIGGERS:= _ psql_error simple_prompt + mainloop.c print.c startup.c describe.c sql_help.h +GETTEXT_TRIGGERS:= _ N_ psql_error simple_prompt