rdelaage/postgresql
1
0
Fork 0
mirror of https://git.postgresql.org/git/postgresql.git synced 2024-10-01 13:21:27 +02:00
Code Issues Packages Projects Releases Wiki Activity

Move \r out of translatable strings

Browse Source 
The translation tools are very unhappy about seeing \r in translatable
strings, so move it to a separate fprintf call.
This commit is contained in:
Peter Eisentraut 2011-08-17 10:52:35 +03:00
parent 1368409034
commit 7f699804b1
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/bin/pg_basebackup/pg_basebackup.c
View File

@ -236,23 +236,25 @@ progress_report(int tablespacenum, const char *filename)
* call) * call)
*/ */
fprintf(stderr, fprintf(stderr,
ngettext("%s/%s kB (100%%), %d/%d tablespace %35s\r", ngettext("%s/%s kB (100%%), %d/%d tablespace %35s",
"%s/%s kB (100%%), %d/%d tablespaces %35s\r", "%s/%s kB (100%%), %d/%d tablespaces %35s",
tablespacecount), tablespacecount),
totaldone_str, totalsize_str, tablespacenum, tablespacecount, ""); totaldone_str, totalsize_str, tablespacenum, tablespacecount, "");
else else
fprintf(stderr, fprintf(stderr,
ngettext("%s/%s kB (%d%%), %d/%d tablespace (%-30.30s)\r", ngettext("%s/%s kB (%d%%), %d/%d tablespace (%-30.30s)",
"%s/%s kB (%d%%), %d/%d tablespaces (%-30.30s)\r", "%s/%s kB (%d%%), %d/%d tablespaces (%-30.30s)",
tablespacecount), tablespacecount),
totaldone_str, totalsize_str, percent, tablespacenum, tablespacecount, filename); totaldone_str, totalsize_str, percent, tablespacenum, tablespacecount, filename);
} }
else else
fprintf(stderr, fprintf(stderr,
ngettext("%s/%s kB (%d%%), %d/%d tablespace\r", ngettext("%s/%s kB (%d%%), %d/%d tablespace",
"%s/%s kB (%d%%), %d/%d tablespaces\r", "%s/%s kB (%d%%), %d/%d tablespaces",
tablespacecount), tablespacecount),
totaldone_str, totalsize_str, percent, tablespacenum, tablespacecount); totaldone_str, totalsize_str, percent, tablespacenum, tablespacecount);
fprintf(stderr, "\r");
} }