Merge pull request #27 from phgrosjean/phg_contrib

Correction of two bugs related to startup
eliocamp · Nov 5, 2024 · 1057b6b · 1057b6b
2 parents 1df2c93 + 36b82e7
commit 1057b6b
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -10,8 +10,9 @@ License: GPL (>= 3)
 Encoding: UTF-8
 Roxygen: list(markdown = TRUE)
 RoxygenNote: 7.3.1
+Depends:
+    utils
 Imports: 
     pkgload,
-    utils,
     yaml
 URL: https://eliocamp.github.io/rhelpi18n/
diff --git a/R/zzzz.R b/R/zzzz.R
@@ -1,4 +1,11 @@
 .onLoad <- function(libname, pkgname){
+  # We need to explicitly set language, otherwise there is a problem in RStudio:
+  # error in strsplit(target_language, ":")[[1]][[1]] : subscript out of bound
+  # when running resolve_lang()
+  if (is.na(Sys.getenv("LANGUAGE", NA)))
+    Sys.setLanguage("en")
+
+  library(utils) # Apparently required for R CMD check despite Depends: utils ?!
   utils <- asNamespace('utils')
 
   package_env <- as.environment('package:utils')