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

Align with withr::local_language() from dev withr #1879

Merged
merged 6 commits into from
Oct 28, 2024
Merged

Align with withr::local_language() from dev withr #1879

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
9b78aee
Align with `withr::local_language()`
krlmlr Oct 8, 2023
3d47402
Try setting LC_ALL
krlmlr Oct 9, 2023
9cd230f
Set LC_ALL first?
krlmlr Oct 23, 2023
43d13d5
Let's try
krlmlr Jan 9, 2024
674cdf3
Set `LANGUAGE` to `"C"`
lionel- Oct 28, 2024
44ec8f1
Bump withr dependency
lionel- Oct 28, 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
4 changes: 2 additions & 2 deletions DESCRIPTION
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ Imports:
rlang (>= 1.1.1),
utils,
waldo (>= 0.5.1),
withr (>= 2.5.0)
withr (>= 3.0.2)
Suggests:
covr,
curl (>= 0.9.5),
Expand All @@ -55,4 +55,4 @@ Config/testthat/parallel: true
Config/testthat/start-first: watcher, parallel*
Encoding: UTF-8
Roxygen: list(markdown = TRUE, r6 = FALSE)
RoxygenNote: 7.2.3
RoxygenNote: 7.3.2
4 changes: 4 additions & 0 deletions NEWS.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# testthat (development version)

* `LANGUAGE` is now set to `"C"` in reprocucible environments (i.e.
`test_that()` blocks) to disable translations. This fixes warnings
about being unable to set the language to `"en"` (#1925).

# testthat 3.2.1

* Fix incorrect format string detected by latest R-devel. Fix thanks to
Expand Down
7 changes: 2 additions & 5 deletions R/local.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ local_reproducible_output <- function(width = 80,
unicode = FALSE,
rstudio = FALSE,
hyperlinks = FALSE,
lang = "en",
lang = "C",
.env = parent.frame()) {

if (unicode) {
Expand Down Expand Up @@ -133,10 +133,7 @@ local_reproducible_output <- function(width = 80,
.local_envir = .env
)

if (isTRUE(capabilities("NLS")) && Sys.getenv("LANG") != "C") {
withr::local_language(lang, .local_envir = .env)
}

withr::local_language(lang, .local_envir = .env)
withr::local_collate("C", .local_envir = .env)
}

Expand Down
2 changes: 1 addition & 1 deletion man/local_test_context.Rd
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion tests/testthat/test-local.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ test_that("local context is 'as promised' inside test_that()", {
expect_equal(getOption("max.print"), 99999)

expect_equal(Sys.getenv("RSTUDIO"), "")
expect_equal(Sys.getenv("LANGUAGE"), "en")
expect_equal(Sys.getenv("LANGUAGE"), "C")

expect_equal(Sys.getlocale("LC_COLLATE"), "C")
})
Expand Down
Loading