Skip to content

Commit 4dfe8ab

Browse files
Use gettext() on character strings directly
1 parent 3023b5c commit 4dfe8ab

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

R/bmerge.R

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ bmerge = function(i, x, icols, xcols, roll, rollends, nomatch, mult, ops, verbos
4141
}
4242

4343
coerce_col = function(dt, col, from_type, to_type, from_name, to_name, verbose_msg) {
44-
if (verbose) catf(verbose_msg, from_type, from_name, to_type, to_name)
44+
if (verbose) catf(verbose_msg, from_type, from_name, to_type, to_name, domain=NULL)
4545
set(dt, j=col, value=cast_with_atts(dt[[col]], match.fun(paste0("as.", to_type))))
4646
}
4747

@@ -87,7 +87,7 @@ bmerge = function(i, x, icols, xcols, roll, rollends, nomatch, mult, ops, verbos
8787
}
8888
cfl = c("character", "logical", "factor")
8989
if (x_merge_type %chin% cfl || i_merge_type %chin% cfl) {
90-
msg = "Coercing all-NA %s column %s to type %s to match type of %s.\n"
90+
msg = gettext("Coercing all-NA %s column %s to type %s to match type of %s.\n")
9191
if (anyNA(i[[ic]]) && allNA(i[[ic]])) {
9292
coerce_col(i, ic, i_merge_type, x_merge_type, iname, xname, msg)
9393
next
@@ -124,7 +124,7 @@ bmerge = function(i, x, icols, xcols, roll, rollends, nomatch, mult, ops, verbos
124124
}
125125
}
126126
if (coerce_x) {
127-
msg = "Coercing %s column %s (which contains no fractions) to type %s to match type of %s.\n"
127+
msg = gettext("Coercing %s column %s (which contains no fractions) to type %s to match type of %s.\n")
128128
coerce_col(i, ic, "double", "integer", iname, xname, msg)
129129
set(callersi, j=ic, value=i[[ic]]) # change the shallow copy of i up in [.data.table to reflect in the result, too.
130130
if (length(ic_idx)>1L) {
@@ -136,11 +136,11 @@ bmerge = function(i, x, icols, xcols, roll, rollends, nomatch, mult, ops, verbos
136136
}
137137
}
138138
if (!coerce_x) {
139-
msg = "Coercing %s column %s to type %s to match type of %s which contains fractions.\n"
139+
msg = gettext("Coercing %s column %s to type %s to match type of %s which contains fractions.\n")
140140
coerce_col(x, xc, "integer", "double", xname, iname, msg)
141141
}
142142
} else {
143-
msg = "Coercing %s column %s to type %s for join to match type of %s.\n"
143+
msg = gettext("Coercing %s column %s to type %s for join to match type of %s.\n")
144144
coerce_col(i, ic, "integer", "double", iname, xname, msg)
145145
if (length(ic_idx)>1L) {
146146
xc_idx = xcols[ic_idx]

0 commit comments

Comments
 (0)