Sys.setLanguage() cleanup: 'C.vs.en' was a kludge for str(), obsolete with r87080

git-svn-id: https://svn.r-project.org/R/trunk@88094 00db46b3-68df-0310-9c12-caf00c1e9a41

Author: smeyer

src/library/base/R/stop.R

@@ -1,7 +1,7 @@
 #  File src/library/base/R/stop.R
 #  Part of the R package, https://www.R-project.org
 #
-#  Copyright (C) 1995-2024 The R Core Team
+#  Copyright (C) 1995-2025 The R Core Team
 #
 #  This program is free software; you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License as published by
@@ -126,24 +126,17 @@ gettextf <- function(fmt, ..., domain = NULL, trim = TRUE)
 
 ## Could think of using *several* domains, i.e. domain = vector; but seems complicated;
 ## the default domain="R"  seems to work for all of base R: {"R", "R-base", "RGui"}
-Sys.setLanguage <- function(lang, unset = "en",
-                            C.vs.en = c("msg", "warn", "silent"), force = FALSE)
+Sys.setLanguage <- function(lang, unset = "en", force = FALSE)
 {
     stopifnot(is.character(lang), length(lang) == 1L, # e.g., "es" , "fr_CA"
               lang == "C" || grepl("^[a-z][a-z]", lang))
     curLang <- Sys.getenv("LANGUAGE", unset = NA) # so it can be reset
     if(is.na(curLang) || !nzchar(curLang))
         curLang <- unset # "factory" default
     if (!capabilities("NLS") || is.na(.popath)) {
-        warning(gettextf("no natural language support or missing translations"), domain=NA)
+        warning("no natural language support or missing translations")
         return(invisible(structure(curLang, ok = FALSE)))
     }
-    Warning <- if(startsWith(lang, "en"))
-                   switch(match.arg(C.vs.en),
-                          silent = function(...){},
-                          msg  = message,
-                          warn = warning)
-               else warning
     if(identical("C", Sys.getlocale()) && lang != "C") { ## e.g. LC_ALL=C R  on Linux
       if(force) {
         lcSet <- if(.Platform[["OS.type"]] == "unix") # works to "undo LC_ALL=C"
@@ -153,19 +146,19 @@ Sys.setLanguage <- function(lang, unset = "en",
         ##        2) How to deal w/ Windows ? {can set things but with *no* effect}
         ok.lc <- !is.null(lcSet) && nzchar(lcSet) # NULL or ""  are not ok
         if(!ok.lc)
-            Warning(gettextf(
+            warning(gettextf(
                 "In bare C locale: LANGUAGE reset, but message language may be unchanged"),
                 domain=NA)
       } else { # !force (default) :
-          Warning(gettextf("In bare C locale, not forcing locale; possibly use 'force = TRUE'?"),
+          warning(gettextf("In bare C locale, not forcing locale; possibly use 'force = TRUE'?"),
                   domain=NA)
           return(invisible(structure(curLang, ok = FALSE)))
       }
     } else ok.lc <- TRUE
     ok <- Sys.setenv(LANGUAGE=lang)
     if(!ok)
         warning(gettextf('Sys.setenv(LANGUAGE="%s") may have failed', lang), domain=NA)
-    ok. <- capabilities("NLS") &&
+    ok. <- #capabilities("NLS") && # asserted above
         isTRUE(bindtextdomain(NULL)) # only flush the cache (of already translated strings)
     invisible(structure(curLang, ok = ok && ok.lc && ok.))
 }

src/library/base/man/gettext.Rd

@@ -27,8 +27,7 @@ ngettext(n, msg1, msg2, domain = NULL)
 
 bindtextdomain(domain, dirname = NULL)
 
-Sys.setLanguage(lang, unset = "en", C.vs.en = c("msg", "warn", "silent"),
-                force = FALSE)
+Sys.setLanguage(lang, unset = "en", force = FALSE)
 }
 \arguments{
   \item{\dots}{one or more character vectors.}
@@ -47,11 +46,6 @@ Sys.setLanguage(lang, unset = "en", C.vs.en = c("msg", "warn", "silent"),
   \item{unset}{a string, specifying the default language assumed to be
     current in the case \code{\link{Sys.getenv}("LANGUAGE")} is unset or
     empty.}
-  \item{C.vs.en}{a string specifying how a current (sometimes \dQuote{hard})
-    setting of language \code{"C"} is treated for \code{lang = "en"}.
-    When \code{"silent"}, nothing happens, when \code{"msg"}, a
-    \code{\link{message}()} and if \code{"warn"} a \code{\link{warning}()}
-    is signalled.}
   \item{force}{logical indicating if in case of a \dQuote{hard} set
     \code{"C"} locale, \code{Sys.setLanguage()} should try modifying the
     locale (to \code{"en"}) in order to subsequently set the desired language