Don't skip when LC_ALL is unset after all

tests/testthat/helper-pkgload.R

@@ -21,9 +21,13 @@ suppress_output <- function(expr) {
 
 # Used to skip tests that will fail when locale is set to C, for
 # instance `with_language()` tests. These tests should only be run
-# when using a locale like `en_US`. The check is cautious and simple:
-# If unset we assume the default might be C or maybe `LANG` is set to C.
+# when using a locale like `en_US`.
 skip_if_c_locale <- function() {
   lc_all <- Sys.getenv("LC_ALL", "")
-  skip_if(lc_all %in% c("", "C", "C.UTF-8"))
+  skip_if(lc_all %in% c("C", "C.UTF-8"))
+
+  if (lc_all == "") {
+    lang <- Sys.getenv("LANG", "")
+    skip_if(lang %in% c("C", "C.UTF-8"))
+  }
 }

tests/testthat/test-po.R

@@ -6,7 +6,7 @@ test_that("translation domain correctly loaded", {
   load_all(test_path("testTranslations"))
   withr::defer(unload("testTranslations"))
 
-  expect_equal(with_language("fr", hello()), "Bonjour")
+  expect_equal(withr::with_language("fr", hello()), "Bonjour")
 
   load_all(test_path("testTranslations"))
   expect_equal(length(temp_po_dirs("testTranslations")), 1)
@@ -21,7 +21,7 @@ test_that("modified translations are correctly reloaded", {
   # Load package and generate translation
   load_all(pkg)
   withr::defer(unload("testTranslations"))
-  with_language("fr", hello())
+  withr::with_language("fr", hello())
 
   # Modify .po file
   po_path <- file.path(pkg, "po", "R-fr.po")
@@ -37,5 +37,5 @@ test_that("modified translations are correctly reloaded", {
 
   # Re-load and re-translate
   load_all(pkg)
-  expect_equal(with_language("fr", hello()), "Salut")
+  expect_equal(withr::with_language("fr", hello()), "Salut")
 })