Translation file for threes was lacking the as_labelled argument => c…

…orrected
SciViews · Oct 27, 2018 · b9a69c1 · b9a69c1
1 parent 2456cb9
commit b9a69c1
Show file tree

Hide file tree

Showing 14 changed files with 25 additions and 38 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,6 +1,6 @@
 Package: data.io
 Type: Package
-Version: 1.2.0
+Version: 1.2.1
 Title: Data Input/Output, Read or Write Data from Files or Datasets in R Packages in Different Formats
 Description: Read or write data from many different formats (tabular datasets,
   from statistic software, ...) into R objects. Add labels and units in
@@ -17,5 +17,5 @@ LazyData: true
 URL: https://github.com/SciViews/data.io, http://www.sciviews.org/SciViews-R
 BugReports: https://github.com/SciViews/data.io/issues
 Roxygen: list(markdown = TRUE)
-RoxygenNote: 6.0.1
+RoxygenNote: 6.1.0
 VignetteBuilder: knitr
diff --git a/NEWS.md b/NEWS.md
@@ -1,5 +1,10 @@
 # data.io News
 
+## Changes in data.io 1.2.1
+
+- the French translation for the trees dataset had no as_labelled argument
+
+
 ## Changes in data.io 1.2.0
 
 - It is now possible to specify the default language to use for read() with

diff --git a/R/data.R b/R/data.R
@@ -58,7 +58,7 @@
 #'   and its content.}
 #' \item{\code{gonads}}{Weight (in g) of the gonads.}
 #' \item{\code{dry_gonads}}{Dry weight (in g) of the gonads.}
-#'  \item{\code{skeleton}}{Weight of the skeleton (g), calculated as the sum of
+#' \item{\code{skeleton}}{Weight of the skeleton (g), calculated as the sum of
 #'  lantern + test + spines.}
 #' \item{\code{lantern}}{Dry weight (in g) of the lantern (the jaw and teeths of
 #'   the sea urchin).}

diff --git a/TODO b/TODO
@@ -2,8 +2,6 @@
 
 * Completion in R and RStudio for `read$` and `write$`.
 
-* geyser translation files are missing!
-
 * label versus comment for a dataframe?
 
 * Rework the read() function.

diff --git a/inst/translation/trees_fr.R b/inst/translation/trees_fr.R
@@ -1,4 +1,4 @@
-.trees_en <- function(trees, labels_only = FALSE) {
+.trees_en <- function(trees, labels_only = FALSE, as_labelled = FALSE) {
   # The trees dataset has a couple of glitches:
   # 1) Girth is indeed the Diameter (and variables not in snake_case), so rename
   names(trees) <- c("diameter", "height", "volume")
@@ -22,8 +22,8 @@
     units = list(
       diameter = "m",
       height = "m",
-      volume = "m^3")
-  )
+      volume = "m^3"),
+    as_labelled = as_labelled)
 
   #if (!isTRUE(labels_only)) {
   # Nothing to do!

diff --git a/man/as_dataframe.Rd b/man/as_dataframe.Rd
diff --git a/man/data_example.Rd b/man/data_example.Rd
diff --git a/man/data_types.Rd b/man/data_types.Rd
diff --git a/man/labelise.Rd b/man/labelise.Rd
diff --git a/man/read.Rd b/man/read.Rd
diff --git a/man/read_write_option.Rd b/man/read_write_option.Rd
diff --git a/man/reexports.Rd b/man/reexports.Rd
diff --git a/man/relative_path.Rd b/man/relative_path.Rd
diff --git a/man/write.Rd b/man/write.Rd