Skip to content

Commit a7379a3

Browse files
break up double-ngettext
1 parent e33bb53 commit a7379a3

File tree

1 file changed

+5
-10
lines changed

1 file changed

+5
-10
lines changed

R/merge.R

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -66,8 +66,8 @@ 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(ngettext(n_dots, "%d unnamed argument wound up in '...' and will be ignored.",
70-
"%d unnamed arguments wound up in '...' and will be ignored."),
69+
warningf(ngettext(n_dots, "merge.data.table() received %d unnamed argument in '...' which will be ignored.",
70+
"merge.data.table() received %d unnamed arguments in '...' which will be ignored."),
7171
n_dots)
7272
} else {
7373
named_idx = nzchar(nm)
@@ -76,14 +76,9 @@ merge.data.table = function(x, y, by = NULL, by.x = NULL, by.y = NULL, all = FAL
7676
"merge.data.table() received %d unknown keyword arguments which will be ignored: %s"),
7777
n_dots, brackify(nm))
7878
} else {
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]))
79+
unnamed_clause <- ngettext(n_unnamed, "%d unnamed argumentin '...'", "%d unnamed arguments in '...'")
80+
named_clause <- ngettext(n_named, "%d unknown keyword argument", "%d unknown keyword argument")
81+
warningf("merge.data.table() received %s and %s, all of which will be ignored: %s", unnamed_clause, named_clause, brackify(nm[named_idx]))
8782
}
8883
}
8984
}

0 commit comments

Comments
 (0)