8000 Move \r out of translatable strings · postgrespro/postgres_cluster@7f69980 · GitHub
[go: up one dir, main page]
Skip to content
8000

Commit 7f69980

Browse files
peterepetere
committed
Move \r out of translatable strings
The translation tools are very unhappy about seeing \r in translatable strings, so move it to a separate fprintf call.
1 parent 1368409 commit 7f69980

File tree

1 file changed

+8
-6
lines changed

1 file changed

+8
-6
lines changed

‎src/bin/pg_basebackup/pg_basebackup.c

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -236,23 +236,25 @@ progress_report(int tablespacenum, const char *filename)
236236
* call)
237237
*/
238238
fprintf(stderr,
239-
ngettext("%s/%s kB (100%%), %d/%d tablespace %35s\r",
240-
"%s/%s kB (100%%), %d/%d tablespaces %35s\r",
239+
ngettext("%s/%s kB (100%%), %d/%d tablespace %35s",
240+
"%s/%s kB (100%%), %d/%d tablespaces %35s",
241241
tablespacecount),
242242
totaldone_str, totalsize_str, tablespacenum, tablespacecount, "");
243243
else
244244
fprintf(stderr,
245-
ngettext("%s/%s kB (%d%%), %d/%d tablespace (%-30.30s)\r",
246-
"%s/%s kB (%d%%), %d/%d tablespaces (%-30.30s)\r",
245+
ngettext("%s/%s kB (%d%%), %d/%d tablespace (%-30.30s)",
246+
"%s/%s kB (%d%%), %d/%d tablespaces (%-30.30s)",
247247
tablespacecount),
248248
totaldone_str, totalsize_str, percent, tablespacenum, tablespacecount, filename);
249249
}
250250
else
251251
fprintf(stderr,
252-
ngettext("%s/%s kB (%d%%), %d/%d tablespace\r",
253-
"%s/%s kB (%d%%), %d/%d tablespaces\r",
252+
ngettext("%s/%s kB (%d%%), %d/%d tablespace",
253+
"%s/%s kB (%d%%), %d/%d tablespaces",
254254
tablespacecount),
255255
totaldone_str, totalsize_str, percent, tablespacenum, tablespacecount);
256+
257+
fprintf(stderr, "\r");
256258
}
257259

258260

0 commit comments

Comments
 (0)
0