Commit674f701

committed

pg_rewing pg_upgrade: Fix translation markers

In pg_log_v(), we need to translate the fmt before processing, not theformatted message afterwards.

1 parentb6a323a commit674f701Copy full SHA for 674f701

File tree

+10

-10

lines changed

+10

-10

lines changed

Lines changed: 5 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -34,26 +34,26 @@ pg_log_v(eLogType type, const char *fmt, va_list ap)`
`34`	`34`	`{`
`35`	`35`	`charmessage[QUERY_ALLOC];`
`36`	`36`
`37`		`-vsnprintf(message,sizeof(message),fmt,ap);`
	`37`	`+vsnprintf(message,sizeof(message),_(fmt),ap);`
`38`	`38`
`39`	`39`	`switch (type)`
`40`	`40`	`{`
`41`	`41`	`casePG_DEBUG:`
`42`	`42`	`if (debug)`
`43`		`-printf("%s",_(message));`
	`43`	`+printf("%s",message);`
`44`	`44`	`break;`
`45`	`45`
`46`	`46`	`casePG_PROGRESS:`
`47`	`47`	`if (showprogress)`
`48`		`-printf("%s",_(message));`
	`48`	`+printf("%s",message);`
`49`	`49`	`break;`
`50`	`50`
`51`	`51`	`casePG_WARNING:`
`52`		`-printf("%s",_(message));`
	`52`	`+printf("%s",message);`
`53`	`53`	`break;`
`54`	`54`
`55`	`55`	`casePG_FATAL:`
`56`		`-printf("\n%s",_(message));`
	`56`	`+printf("\n%s",message);`
`57`	`57`	`printf("%s",_("Failure, exiting\n"));`
`58`	`58`	`exit(1);`
`59`	`59`	`break;`

Lines changed: 5 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -89,7 +89,7 @@ pg_log_v(eLogType type, const char *fmt, va_list ap)`
`89`	`89`	`{`
`90`	`90`	`charmessage[QUERY_ALLOC];`
`91`	`91`
`92`		`-vsnprintf(message,sizeof(message),fmt,ap);`
	`92`	`+vsnprintf(message,sizeof(message),_(fmt),ap);`
`93`	`93`
`94`	`94`	`/* PG_VERBOSE and PG_STATUS are only output in verbose mode */`
`95`	`95`	`/* fopen() on log_opts.internal might have failed, so check it */`
`@@ -108,7 +108,7 @@ pg_log_v(eLogType type, const char *fmt, va_list ap)`
`108`	`108`	`{`
`109`	`109`	`casePG_VERBOSE:`
`110`	`110`	`if (log_opts.verbose)`
`111`		`-printf("%s",_(message));`
	`111`	`+printf("%s",message);`
`112`	`112`	`break;`
`113`	`113`
`114`	`114`	`casePG_STATUS:`
`@@ -123,16 +123,16 @@ pg_log_v(eLogType type, const char *fmt, va_list ap)`
`123`	`123`	`strlen(message) <=MESSAGE_WIDTH-2 ?message :`
`124`	`124`	`message+strlen(message)-MESSAGE_WIDTH+3+2);`
`125`	`125`	`else`
`126`		`-printf(" %s\n",_(message));`
	`126`	`+printf(" %s\n",message);`
`127`	`127`	`break;`
`128`	`128`
`129`	`129`	`casePG_REPORT:`
`130`	`130`	`casePG_WARNING:`
`131`		`-printf("%s",_(message));`
	`131`	`+printf("%s",message);`
`132`	`132`	`break;`
`133`	`133`
`134`	`134`	`casePG_FATAL:`
`135`		`-printf("\n%s",_(message));`
	`135`	`+printf("\n%s",message);`
`136`	`136`	`printf("Failure, exiting\n");`
`137`	`137`	`exit(1);`
`138`	`138`	`break;`

Comments

(0)