Skip to content

Commit 18a0662

Browse files
Apply prefix outside translation to get identical messages in gettext
1 parent fc67d72 commit 18a0662

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

R/merge.R

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -100,12 +100,12 @@ merge.data.table = function(x, y, by = NULL, by.x = NULL, by.y = NULL, all = FAL
100100
dt = tryCatch(
101101
y[x, nomatch=if (all.x) NA else NULL, on=by, allow.cartesian=allow.cartesian],
102102
dt_bmerge_incompatible_type_error = function(e) {
103-
x_part_col_name = e$bmerge_i_arg_col_name
103+
x_part_col_name = paste0("x.", e$bmerge_i_arg_col_name)
104104
x_part_type = e$bmerge_i_arg_type
105-
y_part_col_name = e$bmerge_x_arg_col_name
105+
y_part_col_name = paste0("y.", e$bmerge_x_arg_col_name)
106106
y_part_type = e$bmerge_x_arg_type
107107

108-
stopf("Incompatible join types: x.%s (%s) and y.%s (%s). Factor columns must join to factor or character columns.", x_part_col_name, x_part_type, y_part_col_name, y_part_type, class = "dt_merge_incompatible_type_error")
108+
stopf("Incompatible join types: %s (%s) and %s (%s). Factor columns must join to factor or character columns.", x_part_col_name, x_part_type, y_part_col_name, y_part_type, class = "dt_merge_incompatible_type_error")
109109
}
110110
)
111111

0 commit comments

Comments
 (0)