Skip to content

Commit 840c471

Browse files
pluralization mess
1 parent a8ff6e2 commit 840c471

File tree

1 file changed

+15
-5
lines changed

1 file changed

+15
-5
lines changed

R/merge.R

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -66,14 +66,24 @@ merge.data.table = function(x, y, by = NULL, by.x = NULL, by.y = NULL, all = FAL
6666
# TODO(R >= 3.5.0): use ...length()
6767
if (n_dots <- length(dots <- list(...))) {
6868
if (is.null(nm <- names(dots))) {
69-
warningf("%d unnamed arguments wound up in '...' and will be ignored.", n_dots)
69+
warningf(ngettext(n_dots, "%d unnamed argument wound up in '...' and will be ignored.",
70+
"%d unnamed arguments wound up in '...' and will be ignored."),
71+
n_dots)
7072
} else {
71-
named_idx <- nzchar(nm)
73+
named_idx = nzchar(nm)
7274
if (all(named_idx)) {
73-
warningf("merge.data.table() received %d unknown keyword arguments which will be ignored: %s", n_dots, brackify(nm))
75+
warningf(ngettext(n_dots, "merge.data.table() received %d unknown keyword argument which will be ignored: %s"
76+
"merge.data.table() received %d unknown keyword arguments which will be ignored: %s"),
77+
n_dots, brackify(nm))
7478
} else {
75-
n_named <- sum(named_idx)
76-
warningf("merge.data.table() received %d unnamed arguments in '...' and %d unknown keyword arguments, all of which will be ignored: %s", n_dots - n_named, n_named, brackify(nm[named_idx]))
79+
n_named = sum(named_idx)
80+
n_unnamed = n_dots - n_named
81+
warningf(ngettext(n_named,
82+
ngettext(n_unnamed, "merge.data.table() received %d unnamed argument in '...' and %d unknown keyword argument, all of which will be ignored: %s",
83+
"merge.data.table() received %d unnamed arguments in '...' and %d unknown keyword argument, all of which will be ignored: %s"),
84+
ngettext(n_unnamed, "merge.data.table() received %d unnamed argument in '...' and %d unknown keyword arguments, all of which will be ignored: %s",
85+
"merge.data.table() received %d unnamed arguments in '...' and %d unknown keyword arguments, all of which will be ignored: %s")),
86+
n_unnamed, n_named, brackify(nm[named_idx]))
7787
}
7888
}
7989
}

0 commit comments

Comments
 (0)