Use catf() over messagef() where appropriate

Author: MichaelChirico

R/custom-translators.R

@@ -1,3 +1,7 @@
+catf = function(fmt, ..., sep=" ", domain="R-potools") {
+  cat(gettextf(fmt, ..., domain=domain), sep=sep)
+}
+
 # tends to make some really repetitive messages with call.=TRUE, so always turn it off
 stopf = function(fmt, ..., domain = NULL) {
   stop(gettextf(fmt, ..., domain = NULL), domain = NA, call. = FALSE)

R/find_fuzzy_messages.R

@@ -2,9 +2,15 @@ find_fuzzy_messages <- function(message_data, lang_file) {
   old_message_data = get_po_messages(lang_file)
 
   if (any(idx <- old_message_data$fuzzy == 2L)) {
-    messagef('Found %d translations marked as deprecated in %s.', sum(idx), lang_file)
-    message('Typically, this means the corresponding error messages have been refactored.')
-    message('Reproducing these messages here for your reference since they might still provide some utility.')
+    messagef(
+      paste(
+        'Found %d translations marked as deprecated in %s.',
+        'Typically, this means the corresponding error messages have been refactored.',
+        'Reproducing these messages here for your reference since they might still provide some utility.',
+        sep = '\n'
+      ),
+      sum(idx), lang_file
+    )
 
     dashes = strrep('-', 0.9*getOption('width'))
     old_message_data[idx & type == 'singular', {

R/msgmerge.R

@@ -19,7 +19,7 @@ run_msgmerge <- function(po_file, pot_file, previous = FALSE, verbose = TRUE) {
     # nocov these warnings? i don't know how to trigger them as of this writing.
     warningf("Running msgmerge on './po/%s' failed:\n  %s", basename(po_file), paste(val, collapse = "\n"))
   } else if (verbose) {
-    messagef(paste(val, collapse = "\n"))
+    writeLines(val)
   }
 
   res <- tools::checkPoFile(po_file, strictPlural = TRUE)
@@ -94,7 +94,7 @@ run_msginit <- function(po_path, pot_path, locale, width = 80L, verbose = TRUE)
   if (!identical(attr(val, "status", exact = TRUE), NULL)) {
     stopf("Running msginit on '%s' failed", pot_path)
   } else if (verbose) {
-    messagef(paste(val, collapse = "\n"))
+    writeLines(val)
   }
   invisible()
 }

R/po_compile.R

@@ -24,8 +24,8 @@ po_compile = function(dir = ".", package = NULL, lazy = TRUE, verbose = TRUE) {
     to_delete <- mo_dirs[!basename(mo_dirs) %in% c(po_metadata$language, "en@quot")]
 
     for (dir in to_delete) {
-      if (verbose) messagef(
-        "Found a compiled translation for %s at %s, but no corresponding .po; deleting",
+      if (verbose) catf(
+        "Found a compiled translation for %s at %s, but no corresponding .po; deleting\n",
         basename(dir), dirname(dir)
       )
       unlink(dir, recursive = TRUE)
@@ -34,7 +34,7 @@ po_compile = function(dir = ".", package = NULL, lazy = TRUE, verbose = TRUE) {
 
   for (ii in seq_len(nrow(po_metadata))) {
     row_ii <- po_metadata[ii]
-    if (verbose) messagef("Recompiling '%s' %s translation", row_ii$language, row_ii$type)
+    if (verbose) catf("Recompiling '%s' %s translation\n", row_ii$language, row_ii$type)
     run_msgfmt(row_ii$po, row_ii$mo, verbose = verbose)
   }
 

R/po_create.R

@@ -22,10 +22,10 @@ po_create <- function(languages, dir = ".", verbose = !is_testing()) {
   for (ii in seq_len(nrow(po_files))) {
     row_ii <- po_files[ii]
     if (file.exists(row_ii$po_path)) {
-      if (verbose) messagef("Updating '%s' %s translation", row_ii$language, row_ii$type)
+      if (verbose) catf("Updating '%s' %s translation\n", row_ii$language, row_ii$type)
       run_msgmerge(row_ii$po_path, row_ii$pot_path, previous = TRUE, verbose = verbose)
     } else {
-      if (verbose) messagef("Creating '%s' %s translation", row_ii$language, row_ii$type)
+      if (verbose) catf("Creating '%s' %s translation\n", row_ii$language, row_ii$type)
       run_msginit(row_ii$po_path, row_ii$pot_path, locale = row_ii$language, verbose = verbose)
     }
   }

R/po_extract.R

@@ -27,12 +27,10 @@ po_extract <- function(
 
   n <- nrow(message_data)
   if (!n) {
-    if (verbose) message('No messages to translate')
+    if (verbose) catf('No messages to translate\n')
     return(invisible())
   }
-  # TODO: messagef() is double-translating the ngettext() result...
-  #   it needs an escape valve
-  if (verbose) messagef(ngettext(n, "Found %i message", "Found %i messages"), n)
+  if (verbose) catf(ngettext(n, "Found %i message", "Found %i messages"), n, domain=NA)
 
   po_dir <- file.path(dir, 'po')
   dir.create(po_dir, showWarnings = FALSE)

R/po_update.R

@@ -37,7 +37,7 @@ po_update <- function(dir = ".", lazy = TRUE, verbose = !is_testing()) {
 
   for (ii in seq_len(nrow(meta))) {
     row_ii <- meta[ii]
-    if (verbose) messagef("Updating '%s' %s translation", row_ii$language, row_ii$type)
+    if (verbose) catf("Updating '%s' %s translation\n", row_ii$language, row_ii$type)
     run_msgmerge(row_ii$po, row_ii$pot, previous = TRUE, verbose = verbose)
   }
 

R/translate_package.R

@@ -344,13 +344,13 @@ translate_package = function(
     if (tr_update) {
       # is it worthwhile to try and distinguish the creation time of the
       #  R pot file and the src pot file? probably not...
-      messagef(
-        "Updating translation template for package '%s' (last updated %s)",
+      catf(
+        "Updating translation template for package '%s' (last updated %s)\n",
         package,
         format(file.info(r_potfile)$atime)
       )
     } else {
-      messagef("Starting translations for package '%s'", package)
+      catf("Starting translations for package '%s'\n", package)
     }
   }
   if (!tr_update) dir.create(po_dir, showWarnings = FALSE)
@@ -411,8 +411,8 @@ translate_package = function(
     lang_file <- file.path(po_dir, glue("R-{language}.po"))
     if (tr_update && file.exists(lang_file)) {
       if (verbose) {
-        messagef(
-          'Found existing R translations for %s (%s/%s) in %s. Running msgmerge...',
+        catf(
+          'Found existing R translations for %s (%s/%s) in %s. Running msgmerge...\n',
           language, metadata$full_name_eng, metadata$full_name_native, lang_file
         )
       }
@@ -426,8 +426,8 @@ translate_package = function(
     lang_file <- file.path(po_dir, glue("{language}.po"))
     if (tr_update && file.exists(lang_file)) {
       if (verbose) {
-        messagef(
-          'Found existing src translations for %s (%s/%s) in %s. Running msgmerge...',
+        catf(
+          'Found existing src translations for %s (%s/%s) in %s. Running msgmerge...\n',
           language, metadata$full_name_eng, metadata$full_name_native, lang_file
         )
       }
@@ -448,15 +448,15 @@ translate_package = function(
     ]
 
     if (!length(new_idx)) {
-      if (verbose) messagef('Translations for %s are up to date! Skipping.', language)
+      if (verbose) catf('Translations for %s are up to date! Skipping.\n', language)
       next
     }
     if (verbose) {
-      messagef(
-        'Beginning new translations for %s (%s/%s); found %d untranslated messages',
+      catf(
+        'Beginning new translations for %s (%s/%s); found %d untranslated messages\n',
         language, metadata$full_name_eng, metadata$full_name_native, length(new_idx)
       )
-      message("(To quit translating, press 'Esc'; progress will be saved)")
+      cat("(To quit translating, press 'Esc'; progress will be saved)\n")
     }
 
     po_params$author = prompt('Thanks! Who should be credited with these translations?')

R/write_po_file.R

@@ -36,7 +36,7 @@ write_po_files <- function(message_data, po_dir, params, template = FALSE, use_b
     ))
   }
 
-  if (verbose) messagef('Writing %s', r_file)
+  if (verbose) catf('Writing %s\n', r_file)
 
   write_po_file(
     message_data[message_source == "R"],