Skip to content

Commit 79f5923

Browse files
remove carriage return from translation (#6778)
1 parent 45cbc33 commit 79f5923

File tree

2 files changed

+5
-3
lines changed

2 files changed

+5
-3
lines changed

po/data.table.pot

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -896,7 +896,7 @@ msgstr ""
896896
#: dogroups.c:454 dogroups.c:468
897897
#, c-format
898898
msgid ""
899-
"\rProcessed %d groups out of %d. %.0f%% done. Time elapsed: %ds. ETA: %ds."
899+
"Processed %d groups out of %d. %.0f%% done. Time elapsed: %ds. ETA: %ds."
900900
msgstr ""
901901

902902
#: dogroups.c:473

src/dogroups.c

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -451,7 +451,8 @@ SEXP dogroups(SEXP dt, SEXP dtcols, SEXP groups, SEXP grpcols, SEXP jiscols, SEX
451451
int ETA = (int)(avgTimePerGroup*(ngrp-i-1));
452452
if (hasPrinted || ETA >= 0) {
453453
if (verbose && !hasPrinted) Rprintf(_("\n"));
454-
Rprintf(_("\rProcessed %d groups out of %d. %.0f%% done. Time elapsed: %ds. ETA: %ds."), i+1, ngrp, 100.0*(i+1)/ngrp, (int)(now-startTime), ETA);
454+
Rprintf("\r"); // \r is not internationalizable
455+
Rprintf(_("Processed %d groups out of %d. %.0f%% done. Time elapsed: %ds. ETA: %ds."), i+1, ngrp, 100.0*(i+1)/ngrp, (int)(now-startTime), ETA);
455456
}
456457
nextTime = now+1;
457458
hasPrinted = true;
@@ -465,7 +466,8 @@ SEXP dogroups(SEXP dt, SEXP dtcols, SEXP groups, SEXP grpcols, SEXP jiscols, SEX
465466
else UNPROTECT(1); // the jval. Don't want them to build up. The first jval can stay protected till the end ok.
466467
}
467468
if (showProgress && hasPrinted) {
468-
Rprintf(_("\rProcessed %d groups out of %d. %.0f%% done. Time elapsed: %ds. ETA: %ds."), ngrp, ngrp, 100.0, (int)(wallclock()-startTime), 0);
469+
Rprintf("\r"); // \r is not internationalizable
470+
Rprintf(_("Processed %d groups out of %d. %.0f%% done. Time elapsed: %ds. ETA: %ds."), ngrp, ngrp, 100.0, (int)(wallclock()-startTime), 0);
469471
Rprintf("\n"); // separated so this & the earlier message are identical for translation purposes.
470472
}
471473
if (isNull(lhs) && ans!=NULL) {

0 commit comments

Comments
 (0)