Skip to content

Commit 263b3af

Browse files
fix double-translated merge() call
1 parent 79e4afb commit 263b3af

File tree

2 files changed

+9
-35
lines changed

2 files changed

+9
-35
lines changed

R/merge.R

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -130,13 +130,15 @@ merge.data.table = function(x, y, by = NULL, by.x = NULL, by.y = NULL, all = FAL
130130
if (is.null(nm)) {
131131
warningf(ngettext(n_dots, "merge.data.table() received %d unnamed argument in '...' which will be ignored.",
132132
"merge.data.table() received %d unnamed arguments in '...' which will be ignored."),
133-
n_dots)
133+
n_dots,
134+
domain=NA)
134135
} else {
135136
named_idx = nzchar(nm)
136137
if (all(named_idx)) {
137138
warningf(ngettext(n_dots, "merge.data.table() received %d unknown keyword argument which will be ignored: %s",
138139
"merge.data.table() received %d unknown keyword arguments which will be ignored: %s"),
139-
n_dots, brackify(nm))
140+
n_dots, brackify(nm),
141+
domain=NA)
140142
} else {
141143
n_named <- sum(named_idx)
142144
unnamed_clause <- sprintf(ngettext(n_dots - n_named, "%d unnamed argument in '...'", "%d unnamed arguments in '...'"), n_dots - n_named)

po/R-data.table.pot

Lines changed: 5 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
msgid ""
22
msgstr ""
33
"Project-Id-Version: data.table 1.17.99\n"
4-
"POT-Creation-Date: 2025-12-13 16:36+0000\n"
4+
"POT-Creation-Date: 2025-12-13 16:50+0000\n"
55
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
66
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
77
"Language-Team: LANGUAGE <[email protected]>\n"
@@ -2426,35 +2426,7 @@ msgstr ""
24262426
msgid "column names %s are duplicated in the result"
24272427
msgstr ""
24282428

2429-
#: merge.R:131
2430-
#, c-format
2431-
msgid ""
2432-
"merge.data.table() received %d unnamed argument in '...' which will be "
2433-
"ignored."
2434-
msgstr ""
2435-
2436-
#: merge.R:132
2437-
#, c-format
2438-
msgid ""
2439-
"merge.data.table() received %d unnamed arguments in '...' which will be "
2440-
"ignored."
2441-
msgstr ""
2442-
2443-
#: merge.R:137
2444-
#, c-format
2445-
msgid ""
2446-
"merge.data.table() received %d unknown keyword argument which will be "
2447-
"ignored: %s"
2448-
msgstr ""
2449-
2450-
#: merge.R:138
2451-
#, c-format
2452-
msgid ""
2453-
"merge.data.table() received %d unknown keyword arguments which will be "
2454-
"ignored: %s"
2455-
msgstr ""
2456-
2457-
#: merge.R:144
2429+
#: merge.R:146
24582430
#, c-format
24592431
msgid "merge.data.table() received %s and %s, all of which will be ignored: %s"
24602432
msgstr ""
@@ -3336,19 +3308,19 @@ msgid_plural "merge.data.table() received %d unnamed arguments in '...' which wi
33363308
msgstr[0] ""
33373309
msgstr[1] ""
33383310

3339-
#: merge.R:137
3311+
#: merge.R:138
33403312
msgid "merge.data.table() received %d unknown keyword argument which will be ignored: %s"
33413313
msgid_plural "merge.data.table() received %d unknown keyword arguments which will be ignored: %s"
33423314
msgstr[0] ""
33433315
msgstr[1] ""
33443316

3345-
#: merge.R:142
3317+
#: merge.R:144
33463318
msgid "%d unnamed argument in '...'"
33473319
msgid_plural "%d unnamed arguments in '...'"
33483320
msgstr[0] ""
33493321
msgstr[1] ""
33503322

3351-
#: merge.R:143
3323+
#: merge.R:145
33523324
msgid "%d unknown keyword argument"
33533325
msgid_plural "%d unknown keyword arguments"
33543326
msgstr[0] ""

0 commit comments

Comments
 (0)