Merge pull request #4 from ThinkR-open/translate_en

Translate EN

Author: MurielleDelmotte

NAMESPACE

@@ -2,16 +2,16 @@
 
 export(connect_db)
 export(get_info)
-export(get_info_chene)
-export(get_info_chene_last_truffe)
-export(get_info_chene_truffe)
+export(get_info_oak)
+export(get_info_oak_last_truffle)
+export(get_info_oak_truffle)
 export(get_info_reensemence)
 export(prepare_leaflet)
 export(run_app)
-export(update_db_truffe)
+export(update_db_truffle)
 export(weight_truffles_by)
 export(write_db_new_reens)
-export(write_db_new_truffe)
+export(write_db_new_truffle)
 import(shiny)
 import(shinyMobile)
 importFrom(DBI,ANSI)

NEWS.md

@@ -1,9 +1,15 @@
 # truffles (development version)
 
+- Rename `update_db_truffe()` -> `update_db_truffle()`
+- Rename `write_db_new_truffe()` -> `write_db_new_truffle()`
+- Rename `get_info_chene()` -> `get_info_oak()`
+- Rename `get_info_chene_last_truffe()` -> `get_info_oak_last_truffle()`
+- Rename `get_info_chene_truffe()` -> `get_info_oak_truffle()`
+
 # truffles 0.0.2
 
 - Using flexbox in modals
-- New function get_info_reensemence() to get information about the latest reseeding date
+- New function `get_info_reensemence()` to get information about the latest reseeding date
 - Add User Doc / Dev Doc in pkgdown 
 
 # truffles 0.0.1
@@ -15,4 +21,4 @@
 - New function get_info_chene_truffe() to get information about truffles associated with an oak tree
 - New function update_db_truffe() to update a row in the "truffe" table of a database.
 - New function weight_truffles_by() to calculate total weight of truffles grouped by specified columns
-- New function write_db_new_truffe() to write new truffle data to the database
+- New function write_db_new_truffle() to write new truffle data to the database

R/app_server.R

@@ -63,7 +63,7 @@ app_server <- function(input, output, session) {
 
 
     if (isTRUE(global$missingdata)) {
-      info <- get_info_chene_last_truffe(dbtruffe = global$truffe, theidoak = input$chene_click, filter_missing_info = TRUE)
+      info <- get_info_oak_last_truffle(dbtruffle = global$truffe, theidoak = input$chene_click, filter_missing_info = TRUE)
 
       golem::invoke_js(
         "modal_info_missing",
@@ -78,8 +78,8 @@ app_server <- function(input, output, session) {
       )
     } else {
       info <- get_info(
-        dbchene = global$chenes,
-        dbtruffe = global$truffe,
+        dboak = global$chenes,
+        dbtruffle = global$truffe,
         dbreensemence = global$reensemence,
         theidoak = input$chene_click
       )
@@ -91,7 +91,7 @@ app_server <- function(input, output, session) {
           type = info$chene$type,
           date_reens = info$reensemence,
           date_p = as.Date(info$chene$planting_date),
-          der_truf = info$truffes$derniere_truffe,
+          der_truf = info$truffes$last_truffle,
           tot_weight = info$truffes$weight_tot,
           last_comment = info$truffes$last_comment,
           other_comments = info$truffes$other_comments
@@ -105,7 +105,7 @@ app_server <- function(input, output, session) {
     req(input$new_truffe)
     log_info_dev("observeEvent(input$new_truffe, ...")
 
-    write_db_new_truffe(
+    write_db_new_truffle(
       conn = global$conn,
       theidoak = input$new_truffe[1],
       date_found = input$new_truffe[2],
@@ -134,7 +134,7 @@ app_server <- function(input, output, session) {
     req(input$complete_truffe)
     log_info_dev("observeEvent(input$complete_truffe, ...")
 
-    update_db_truffe(
+    update_db_truffle(
       conn = global$conn,
       idtruffle = input$complete_truffe[2],
       idoak = input$complete_truffe[1],

R/get_info.R

@@ -4,8 +4,8 @@
 #' This function retrieves information about oak trees and truffles based on the provided
 #' databases and oak tree ID.
 #'
-#' @param dbchene Database containing information about oak trees.
-#' @param dbtruffe Database containing information about truffles.
+#' @param dboak Database containing information about oak trees.
+#' @param dbtruffle Database containing information about truffles.
 #' @param dbreensemence Database containing reseeding information.
 #' @param theidoak ID of the oak tree for which information is to be retrieved.
 #'
@@ -19,12 +19,12 @@
 #' truffe <- DBI::dbReadTable(conn, name = "truffe")
 #' reensemence <- DBI::dbReadTable(conn, name = "reens")
 #'
-#' get_info(dbchene = chene, dbtruffe = truffe, dbreensemence = reensemence, theidoak = "162")
+#' get_info(dboak = chene, dbtruffle = truffe, dbreensemence = reensemence, theidoak = "162")
 #' DBI::dbDisconnect(conn)
-get_info <- function(dbchene, dbtruffe, dbreensemence, theidoak) {
+get_info <- function(dboak, dbtruffle, dbreensemence, theidoak) {
   resultat <- list(
-    chene = get_info_chene(dbchene = dbchene, theidoak = theidoak),
-    truffes = get_info_chene_truffe(dbtruffe = dbtruffe, theidoak = theidoak),
+    chene = get_info_oak(dboak = dboak, theidoak = theidoak),
+    truffes = get_info_oak_truffle(dbtruffle = dbtruffle, theidoak = theidoak),
     reensemence = get_info_reensemence(dbreensemence = dbreensemence, theidoak = theidoak)
   )
 

R/get_info_chene.R renamed to R/get_info_oak.R

@@ -4,7 +4,7 @@
 #' This function retrieves information about a specific oak tree based on its ID
 #' from the provided oak tree database.
 #'
-#' @param dbchene Database containing information about oak trees.
+#' @param dboak Database containing information about oak trees.
 #' @param theidoak ID of the oak tree for which information is to be retrieved.
 #'
 #' @return A list containing information about the oak tree, including its type and
@@ -22,14 +22,14 @@
 #'  )
 #' chene <- DBI::dbReadTable(conn, name = "chenes")
 #'
-#' get_info_chene(dbchene = chene, theidoak = "162")
+#' get_info_oak(dboak = chene, theidoak = "162")
 #'
-get_info_chene <- function(dbchene, theidoak) {
-  check_param(dbchene, "data.frame")
+get_info_oak <- function(dboak, theidoak) {
+  check_param(dboak, "data.frame")
   check_param(theidoak, "character")
-  check_names_dataframe(c("idoak", "type", "planting_date"), dbchene)
+  check_names_dataframe(c("idoak", "type", "planting_date"), dboak)
 
-  oak <- dbchene |>
+  oak <- dboak |>
     filter(idoak == theidoak)
 
   return(list(

R/get_info_chene_last_truffe.R renamed to R/get_info_oak_last_truffle.R

@@ -3,7 +3,7 @@
 #'
 #' This function retrieves information about the last truffle found on a specific oak tree.
 #'
-#' @param dbtruffe A data frame containing information about truffles.
+#' @param dbtruffle A data frame containing information about truffles.
 #' @param theidoak The ID of the oak tree.
 #' @param filter_missing_info logical to filter truffle with missing data
 #' @importFrom dplyr filter mutate
@@ -12,38 +12,38 @@
 #' @export
 #' @examples
 #'
-#' dbtruffe <- data.frame(
+#' dbtruffle <- data.frame(
 #'   idoak = c("123", "123", "456", "789"),
 #'   estimation = c(1, 0, 1, 0),
 #'   weight = c(NA, 5, 10, 100),
 #'   date_found = as.Date(c("2023-01-01", "2023-03-15", "2023-02-01", "2022-12-01"))
 #' )
 #'
-#' get_info_chene_last_truffe(dbtruffe = dbtruffe, theidoak = "123")
-#' get_info_chene_last_truffe(dbtruffe = dbtruffe, theidoak = "123", filter_missing_info = TRUE)
-get_info_chene_last_truffe <- function(dbtruffe, theidoak, filter_missing_info = FALSE) {
-  check_param(dbtruffe, "data.frame")
+#' get_info_oak_last_truffle(dbtruffle = dbtruffle, theidoak = "123")
+#' get_info_oak_last_truffle(dbtruffle = dbtruffle, theidoak = "123", filter_missing_info = TRUE)
+get_info_oak_last_truffle <- function(dbtruffle, theidoak, filter_missing_info = FALSE) {
+  check_param(dbtruffle, "data.frame")
   check_param(theidoak, "character")
   check_param(filter_missing_info, "logical")
-  check_names_dataframe(c("weight", "estimation", "idoak"), dbtruffe)
+  check_names_dataframe(c("weight", "estimation", "idoak"), dbtruffle)
 
 
-  if (!any(theidoak %in% dbtruffe$idoak)) {
+  if (!any(theidoak %in% dbtruffle$idoak)) {
     return(data.frame())
   }
 
   if (isTRUE(filter_missing_info)) {
-    dbtruffe <- dbtruffe |>
+    dbtruffle <- dbtruffle |>
       dplyr::filter(estimation == 1 | is.na(weight))
   }
 
-  truffe_chene <- dbtruffe |>
+  truffle_oak <- dbtruffle |>
     filter(idoak == theidoak) |>
     filter(date_found == max(date_found)) |>
     dplyr::mutate(estim_js = dplyr::case_when(
-      estimation == 1 ~ "checked = 'checked'", # TODO : deplace
+      estimation == 1 ~ "checked = 'checked'", 
       TRUE ~ ""
     ))
 
-  return(truffe_chene)
+  return(truffle_oak)
 }

R/get_info_chene_truffe.R renamed to R/get_info_oak_truffle.R

@@ -4,7 +4,7 @@
 #' This function retrieves information about truffles associated with a specific oak tree
 #' based on the oak tree's ID from the provided truffle database.
 #'
-#' @param dbtruffe Database containing information about truffles.
+#' @param dbtruffle Database containing information about truffles.
 #' @param theidoak ID of the oak tree for which information about associated truffles
 #' is to be retrieved.
 #'
@@ -21,29 +21,29 @@
 #'  )
 #' truffe <- DBI::dbReadTable(conn, name = "truffe")
 #'
-#' get_info_chene_truffe(dbtruffe = truffe, theidoak = "119")
+#' get_info_oak_truffle(dbtruffle = truffe, theidoak = "119")
 #' DBI::dbDisconnect(conn)
-get_info_chene_truffe <- function(dbtruffe, theidoak) {
-    check_param(dbtruffe, "data.frame")
+get_info_oak_truffle <- function(dbtruffle, theidoak) {
+    check_param(dbtruffle, "data.frame")
     check_param(theidoak, "character")
     check_names_dataframe(c(
         "idoak", "weight", "date_found",
         "comment"
-    ), dbtruffe)
-    truffe_chene <- filter(dbtruffe, idoak == theidoak)
-    if (nrow(truffe_chene) == 0) {
-        return(list(weight_tot = 0, derniere_truffe = "-", last_comment = "-", other_comments = "-"))
+    ), dbtruffle)
+    truffle_oak <- filter(dbtruffle, idoak == theidoak)
+    if (nrow(truffle_oak) == 0) {
+        return(list(weight_tot = 0, last_truffle = "-", last_comment = "-", other_comments = "-"))
     }
 
 
-    weight_tot <- pull(summarise(truffe_chene, weight_tot = sum(weight,
+    weight_tot <- pull(summarise(truffle_oak, weight_tot = sum(weight,
         na.rm = TRUE
     )), weight_tot)
-    derniere_truffe <- pull(summarise(truffe_chene, date_found = as.Date(max(date_found,
+    last_truffle <- pull(summarise(truffle_oak, date_found = as.Date(max(date_found,
         na.rm = TRUE
     ))), date_found)
 
-    sort_comment <- truffe_chene |>
+    sort_comment <- truffle_oak |>
         arrange(desc(date_found))
 
     last_comment <- paste(as.Date(sort_comment$date_found[1]),
@@ -64,7 +64,7 @@ get_info_chene_truffe <- function(dbtruffe, theidoak) {
 
     return(list(
         weight_tot = weight_tot, 
-        derniere_truffe = derniere_truffe,
+        last_truffle = last_truffle,
         last_comment = last_comment,
         other_comments = other_comments
     ))

R/globals.R

@@ -1,18 +1,18 @@
 globalVariables(unique(c(
-  # app_server:
-  "planting_date",
-  "id",
-  "type",
-  # get_info_chene:
-  "id",
-  # get_info_chene_truffe:
-  "date_found",
-  "idoak",
-  "weight",
-  "annee",
-  "present",
-  # prepare_leaflet:
-  "estimation",
-  "info_missing",
-  "info_reens"
-)))
+# app_server:
+"present",
+# get_info_oak:
+"idoak",
+# get_info_oak_last_truffle:
+"date_found", "estimation", "idoak", "weight",
+# get_info_oak_truffle:
+"date_found", "idoak", "weight",
+# get_info_reensemence:
+"idoak",
+# mod_dataviz_server : <anonymous>:
+"annee", "date_found", "type", "weight",
+# prepare_leaflet:
+"estimation", "idoak", "info_missing", "info_reens", "weight",
+# weight_truffles_by:
+"weight"
+)))

R/mod_carto_leaflet.R

@@ -53,8 +53,8 @@ mod_carto_leaflet_server <- function(id, global) {
       log_info_dev("prepa leaflet")
       # prepa data to js
       local$df_prep <- prepare_leaflet(
-        dbchene = global$chenes,
-        dbtruffe = global$truffe,
+        dboak = global$chenes,
+        dbtruffle = global$truffe,
         dbreens = global$reensemence
       )
     })

R/prepare_leaflet.R

@@ -3,15 +3,15 @@
 #'
 #' This function prepares data for Leaflet JavaScript visualization.
 #'
-#' @param dbchene A data frame containing information about oak trees.
-#' @param dbtruffe A data frame containing information about truffles.
+#' @param dboak A data frame containing information about oak trees.
+#' @param dbtruffle A data frame containing information about truffles.
 #' @param dbreens A data frame containing information about reensemencement.
 #' @importFrom dplyr filter mutate distinct full_join
 #' @return A list suitable for passing to Leaflet JavaScript for visualization.
 #'
 #' @export
 #' @examples
-#' dbchene <- data.frame(
+#' dboak <- data.frame(
 #'   idoak = c(1, 2, 3),
 #'   chene_nom = c("Chene 1", "Chene 2", "Chene 3")
 #' )
@@ -22,23 +22,23 @@
 #'   date_reens = c("2022-04-30")
 #' )
 #' 
-#' dbtruffe <- data.frame(
+#' dbtruffle <- data.frame(
 #'   idoak = c(1, 1, 3),
 #'   idtruffle = c(1, 2, 3),
 #'   estimation = c(1, 0, 1),
 #'   weight = c(10, 15, NA)
 #' )
-#' prepare_leaflet(dbchene, dbtruffe, dbreens)
-prepare_leaflet <- function(dbchene, dbtruffe, dbreens) {
-  t <- dbtruffe |>
+#' prepare_leaflet(dboak, dbtruffle, dbreens)
+prepare_leaflet <- function(dboak, dbtruffle, dbreens) {
+  t <- dbtruffle |>
     dplyr::filter(estimation == 1 | is.na(weight)) |>
     dplyr::mutate(info_missing = 1) |>
     dplyr::distinct(idoak, info_missing)
 
   r <- dbreens |>
         dplyr::mutate(info_reens = 1) |>
         dplyr::distinct(idoak, info_reens)
-  c <- dbchene |>
+  c <- dboak |>
     dplyr::full_join(
       t,
       by = "idoak"