Skip to content

Commit bd903b0

Browse files
author
lawrence
committed
Copy base .mo files to translations package, even when DESCRIPTION exists; PR#18694, Michael Chirico
git-svn-id: https://svn.r-project.org/R/trunk@87266 00db46b3-68df-0310-9c12-caf00c1e9a41
1 parent c84d936 commit bd903b0

File tree

2 files changed

+6
-1
lines changed

2 files changed

+6
-1
lines changed

doc/NEWS.Rd

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -281,6 +281,10 @@
281281
282282
\subsection{BUG FIXES}{
283283
\itemize{
284+
\item \code{update_pkg_po()} now copies \file{.mo} files to the
285+
\pkg{translation} package even if a \file{DESCRIPTION} file
286+
exists, thanks to \I{Michael Chirico} fixing \PR{18694}.
287+
284288
\item Auto-generated \code{citation()} entries no longer include
285289
(additional) URLs in the \samp{note} field (\PR{18547}).
286290

src/library/tools/R/translations.R

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,8 @@ update_pkg_po <- function(pkgdir, pkg = NULL, version = NULL,
103103
if (missing(copyright)) copyright <- NULL
104104
if (missing(bugs)) bugs <- NULL
105105
stem <- file.path("inst", "po")
106-
} else { # A base package
106+
}
107+
if (is.null(pkg) || pkg %in% .get_standard_package_names()$base) { # A base package
107108
pkg <- basename(pkgdir)
108109
name <- "R"
109110
version <- as.character(getRversion())

0 commit comments

Comments
 (0)