Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

.checkTypos: Avoid giving arbitrary strings to gettextf #6590

Merged
merged 5 commits into from
Oct 21, 2024
Merged

.checkTypos: Avoid giving arbitrary strings to gettextf #6590

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
38588c6
Avoid giving arbitrary strings to gettextf
aitap Oct 21, 2024
5e05b2e
Also don't try translating it
MichaelChirico Oct 21, 2024
c9c818a
Add a comment
MichaelChirico Oct 21, 2024
8c57275
Regression test for .checkTypos
aitap Oct 21, 2024
11c18bd
Merge branch 'master' into fix-6588
MichaelChirico Oct 21, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion R/data.table.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,8 @@ replace_dot_alias = function(e) {
stopf("Object '%s' not found amongst %s", used, brackify(ref))
}
} else {
stopf(err$message)
# Don't use stopf() directly, since err$message might have '%', #6588
stopf("%s", err$message, domain=NA)
MichaelChirico marked this conversation as resolved.
Show resolved Hide resolved
MichaelChirico marked this conversation as resolved.
Show resolved Hide resolved
}
}

Expand Down
3 changes: 3 additions & 0 deletions inst/tests/tests.Rraw
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20591,3 +20591,6 @@ setDT(d2)
test(2295.1, !is.data.table(d1))
test(2295.2, rownames(d1), 'b')
test(2295.3, is.data.table(d2))

# #6588: .checkTypos used to give arbitrary strings to stopf as the first argument
test(2296, d2[x %no such operator% 1], error = '%no such operator%')
Loading