diff --git a/CITATION.cff b/CITATION.cff index 86a9872..1866a54 100644 --- a/CITATION.cff +++ b/CITATION.cff @@ -9,7 +9,7 @@ type: software license: AGPL-3.0-or-later title: 'FreesearchR: A free and open-source browser based data analysis tool for researchers with publication ready output' -version: 25.8.2 +version: 25.8.3 doi: 10.5281/zenodo.14527429 identifiers: - type: url @@ -1030,6 +1030,27 @@ references: email: rpruim@calvin.edu year: '2025' doi: 10.32614/CRAN.package.NHANES +- type: software + title: shiny.i18n + abstract: 'shiny.i18n: Shiny Applications Internationalization' + notes: Imports + url: https://appsilon.github.io/shiny.i18n/ + repository: https://CRAN.R-project.org/package=shiny.i18n + authors: + - family-names: Nowicki + given-names: Jakub + email: opensource+kuba@appsilon.com + - family-names: Krzemiński + given-names: Dominik + email: raymon92@gmail.com + - family-names: Igras + given-names: Krystian + email: krystian8207@gmail.com + - family-names: Sobolewski + given-names: Jakub + email: jakub.sobolewski@appsilon.com + year: '2025' + doi: 10.32614/CRAN.package.shiny.i18n - type: software title: styler abstract: 'styler: Non-Invasive Pretty Printing of R Code' diff --git a/DESCRIPTION b/DESCRIPTION index 4620094..5feb555 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,6 +1,6 @@ Package: FreesearchR Title: A free and open-source browser based data analysis tool for researchers with publication ready output -Version: 25.8.2 +Version: 25.8.3 Authors@R: c( person("Andreas Gammelgaard", "Damsbo",email="agdamsbo@clin.au.dk", role = c("aut", "cre"), comment = c(ORCID = "0000-0002-7559-1154")), @@ -66,7 +66,8 @@ Imports: shinyjs, emmeans, readxl, - NHANES + NHANES, + shiny.i18n Suggests: styler, devtools, diff --git a/NAMESPACE b/NAMESPACE index 07e6e03..ebd9e89 100644 --- a/NAMESPACE +++ b/NAMESPACE @@ -78,10 +78,13 @@ export(line_break) export(list_allowed_operations) export(m_redcap_readServer) export(m_redcap_readUI) +export(make_validation) +export(make_validation_alerts) export(merge_expression) export(merge_long) export(missing_fraction) export(missings_apex_plot) +export(missings_validate) export(modal_create_column) export(modal_cut_variable) export(modal_update_factor) @@ -130,6 +133,8 @@ export(update_factor_server) export(update_factor_ui) export(update_variables_server) export(update_variables_ui) +export(validation_server) +export(validation_ui) export(vectorSelectInput) export(vertical_stacked_bars) export(visual_summary) diff --git a/NEWS.md b/NEWS.md index 9380ded..da0d818 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,3 +1,11 @@ +# FreesearchR 25.8.3 - DEV + +*NEW* Language has been revised to make the app more accessible and easier to understand. + +*NEW* Initial and very rudimentary translation for Danish and Swahili is introduced. Other languages can be added as well. + +*NEW* Alerts as to guide on select important steps and aspects are introduced. This is expected to expand. + # FreesearchR 25.8.2 - *NEW* Including the [NHANES](https://cran.r-project.org/web/packages/NHANES/refman/NHANES.html#NHANES) dataset for experimentation. diff --git a/R/app_version.R b/R/app_version.R index 433f527..5498842 100644 --- a/R/app_version.R +++ b/R/app_version.R @@ -1 +1 @@ -app_version <- function()'25.8.2' +app_version <- function()'25.8.3' diff --git a/R/create-column-mod.R b/R/create-column-mod.R index 2276805..573d83f 100644 --- a/R/create-column-mod.R +++ b/R/create-column-mod.R @@ -63,7 +63,7 @@ create_column_ui <- function(id) { width = 6, textInput( inputId = ns("new_column"), - label = i18n("New column name:"), + label = i18n$t("New column name:"), value = "new_column1", width = "100%" ) @@ -72,7 +72,7 @@ create_column_ui <- function(id) { width = 6, shinyWidgets::virtualSelectInput( inputId = ns("group_by"), - label = i18n("Group calculation by:"), + label = i18n$t("Group calculation by:"), choices = NULL, multiple = TRUE, disableSelectAll = TRUE, @@ -83,7 +83,7 @@ create_column_ui <- function(id) { ), shiny::textAreaInput( inputId = ns("expression"), - label = i18n("Enter an expression to define new column:"), + label = i18n$t("Enter an expression to define new column:"), value = "", width = "100%", rows = 6 @@ -91,7 +91,7 @@ create_column_ui <- function(id) { tags$i( class = "d-block", phosphoricons::ph("info"), - datamods::i18n("Click on a column name to add it to the expression:") + i18n$t("Click on a column name to add it to the expression:") ), uiOutput(outputId = ns("columns")), uiOutput(outputId = ns("feedback")), @@ -105,7 +105,7 @@ create_column_ui <- function(id) { actionButton( inputId = ns("compute"), label = tagList( - phosphoricons::ph("gear"), i18n("Create column") + phosphoricons::ph("gear"), i18n$t("Create column") ), class = "btn-outline-primary", width = "100%" @@ -140,9 +140,9 @@ create_column_server <- function(id, info_alert <- shinyWidgets::alert( status = "info", phosphoricons::ph("question"), - datamods::i18n("Choose a name for the column to be created or modified,"), - datamods::i18n("then enter an expression before clicking on the button above to validate or on "), - phosphoricons::ph("trash"), datamods::i18n("to delete it.") + i18n$t("Choose a name for the column to be created or modified,"), + i18n$t("then enter an expression before clicking on the button above to validate or on "), + phosphoricons::ph("trash"), i18n$t("to delete it.") ) rv <- reactiveValues( @@ -187,7 +187,7 @@ create_column_server <- function(id, if (input$new_column == "") { rv$feedback <- shinyWidgets::alert( status = "warning", - phosphoricons::ph("warning"), datamods::i18n("New column name cannot be empty") + phosphoricons::ph("warning"), i18n$t("New column name cannot be empty") ) } }) @@ -252,7 +252,7 @@ list_allowed_operations <- function() { #' #' @rdname create-column modal_create_column <- function(id, - title = i18n("Create a new column"), + title = i18n$t("Create a new column"), easyClose = TRUE, size = "l", footer = NULL) { @@ -277,7 +277,7 @@ modal_create_column <- function(id, #' @importFrom htmltools tagList #' @rdname create-column winbox_create_column <- function(id, - title = i18n("Create a new column"), + title = i18n$t("Create a new column"), options = shinyWidgets::wbOptions(), controls = shinyWidgets::wbControls()) { ns <- NS(id) @@ -311,7 +311,7 @@ try_compute_column <- function(expression, } funs <- unlist(c(extract_calls(parsed), lapply(parsed, extract_calls)), recursive = TRUE) if (!are_allowed_operations(funs, allowed_operations)) { - return(datamods:::alert_error(datamods::i18n("Some operations are not allowed"))) + return(datamods:::alert_error(i18n$t("Some operations are not allowed"))) } if (!isTruthy(by)) { result <- try( @@ -351,7 +351,7 @@ try_compute_column <- function(expression, ) shinyWidgets::alert( status = "success", - phosphoricons::ph("check"), datamods::i18n("Column added!") + phosphoricons::ph("check"), i18n$t("Column added!") ) } @@ -421,7 +421,7 @@ make_choices_with_infos <- function(data) { # NULL # } description <- if (is.atomic(values)) { - paste(i18n("Unique values:"), data.table::uniqueN(values)) + paste(i18n$t("Unique values:"), data.table::uniqueN(values)) } else { "" } diff --git a/R/cut-variable-dates.R b/R/cut-variable-dates.R index 9c78e73..05dcd5b 100644 --- a/R/cut-variable-dates.R +++ b/R/cut-variable-dates.R @@ -208,7 +208,7 @@ cut_variable_ui <- function(id) { width = 3, shinyWidgets::virtualSelectInput( inputId = ns("variable"), - label = datamods:::i18n("Variable to cut:"), + label = i18n$t("Variable to cut:"), choices = NULL, width = "100%" ) @@ -221,7 +221,7 @@ cut_variable_ui <- function(id) { width = 3, numericInput( inputId = ns("n_breaks"), - label = datamods:::i18n("Number of breaks:"), + label = i18n$t("Number of breaks:"), value = 3, min = 2, max = 12, @@ -232,12 +232,12 @@ cut_variable_ui <- function(id) { width = 3, checkboxInput( inputId = ns("right"), - label = datamods:::i18n("Close intervals on the right"), + label = i18n$t("Close intervals on the right"), value = TRUE ), checkboxInput( inputId = ns("include_lowest"), - label = datamods:::i18n("Include lowest value"), + label = i18n$t("Include lowest value"), value = TRUE ) ) @@ -251,7 +251,7 @@ cut_variable_ui <- function(id) { toastui::datagridOutput2(outputId = ns("count")), actionButton( inputId = ns("create"), - label = tagList(phosphoricons::ph("scissors"), datamods:::i18n("Create factor variable")), + label = tagList(phosphoricons::ph("scissors"), i18n$t("Create factor variable")), class = "btn-outline-primary float-end" ), tags$div(class = "clearfix") @@ -321,7 +321,7 @@ cut_variable_server <- function(id, data_r = reactive(NULL)) { shinyWidgets::noUiSliderInput( inputId = session$ns("fixed_brks"), - label = datamods:::i18n("Fixed breaks:"), + label = i18n$t("Fixed breaks:"), min = lower, max = upper, value = brks, @@ -376,7 +376,7 @@ cut_variable_server <- function(id, data_r = reactive(NULL)) { shinyWidgets::virtualSelectInput( inputId = session$ns("method"), - label = datamods:::i18n("Method:"), + label = i18n$t("Method:"), choices = choices, selected = NULL, width = "100%" @@ -570,7 +570,7 @@ cut_variable_server <- function(id, data_r = reactive(NULL)) { #' #' @rdname cut-variable modal_cut_variable <- function(id, - title = datamods:::i18n("Convert Numeric to Factor"), + title = i18n$t("Convert Numeric to Factor"), easyClose = TRUE, size = "l", footer = NULL) { diff --git a/R/datagrid-infos-mod.R b/R/datagrid-infos-mod.R index ce8dad1..bc3ecad 100644 --- a/R/datagrid-infos-mod.R +++ b/R/datagrid-infos-mod.R @@ -129,14 +129,14 @@ describe_col_char <- function(x, with_summary = TRUE) { tagList( tags$hr(style = htmltools::css(margin = "3px 0")), tags$div( - datamods:::i18n("Unique:"), length(unique(x)) + i18n$t("Unique:"), length(unique(x)) ), tags$div( - datamods:::i18n("Missing:"), sum(is.na(x)) + i18n$t("Missing:"), sum(is.na(x)) ), tags$div( style = htmltools::css(whiteSpace = "normal", wordBreak = "break-all"), - datamods:::i18n("Most Common:"), gsub( + i18n$t("Most Common:"), gsub( pattern = "'", replacement = "\u07F4", x = names(sort(table(x), decreasing = TRUE))[1] @@ -178,7 +178,7 @@ describe_col_factor <- function(x, with_summary = TRUE) { names(two), ":", fmt_p(two, total) ), tags$div( - "Missing", ":", fmt_p(missing, total) + i18n$t("Missing:"), fmt_p(missing, total) ), tags$div( "\u00A0" @@ -201,16 +201,16 @@ describe_col_num <- function(x, with_summary = TRUE) { tagList( tags$hr(style = htmltools::css(margin = "3px 0")), tags$div( - datamods:::i18n("Min:"), round(min(x, na.rm = TRUE), 2) + i18n$t("Min:"), round(min(x, na.rm = TRUE), 2) ), tags$div( - datamods:::i18n("Mean:"), round(mean(x, na.rm = TRUE), 2) + i18n$t("Mean:"), round(mean(x, na.rm = TRUE), 2) ), tags$div( - datamods:::i18n("Max:"), round(max(x, na.rm = TRUE), 2) + i18n$t("Max:"), round(max(x, na.rm = TRUE), 2) ), tags$div( - datamods:::i18n("Missing:"), sum(is.na(x)) + i18n$t("Missing:"), sum(is.na(x)) ) ) } @@ -231,13 +231,13 @@ describe_col_date <- function(x, with_summary = TRUE) { tagList( tags$hr(style = htmltools::css(margin = "3px 0")), tags$div( - datamods:::i18n("Min:"), min(x, na.rm = TRUE) + i18n$t("Min:"), min(x, na.rm = TRUE) ), tags$div( - datamods:::i18n("Max:"), max(x, na.rm = TRUE) + i18n$t("Max:"), max(x, na.rm = TRUE) ), tags$div( - datamods:::i18n("Missing:"), sum(is.na(x)) + i18n$t("Missing:"), sum(is.na(x)) ), tags$div( "\u00A0" @@ -260,13 +260,13 @@ describe_col_datetime <- function(x, with_summary = TRUE) { tagList( tags$hr(style = htmltools::css(margin = "3px 0")), tags$div( - datamods:::i18n("Min:"), min(x, na.rm = TRUE) + i18n$t("Min:"), min(x, na.rm = TRUE) ), tags$div( - datamods:::i18n("Max:"), max(x, na.rm = TRUE) + i18n$t("Max:"), max(x, na.rm = TRUE) ), tags$div( - datamods:::i18n("Missing:"), sum(is.na(x)) + i18n$t("Missing:"), sum(is.na(x)) ), tags$div( "\u00A0" @@ -290,10 +290,10 @@ describe_col_other <- function(x, with_summary = TRUE) { tagList( tags$hr(style = htmltools::css(margin = "3px 0")), tags$div( - datamods:::i18n("Unique:"), length(unique(x)) + i18n$t("Unique:"), length(unique(x)) ), tags$div( - datamods:::i18n("Missing:"), sum(is.na(x)) + i18n$t("Missing:"), sum(is.na(x)) ), tags$div( "\u00A0" diff --git a/R/hosted_version.R b/R/hosted_version.R index 8f6fca3..9108a04 100644 --- a/R/hosted_version.R +++ b/R/hosted_version.R @@ -1 +1 @@ -hosted_version <- function()'v25.8.2-250827' +hosted_version <- function()'v25.8.3-250910' diff --git a/R/import-file-ext.R b/R/import-file-ext.R index 1eba71a..a8e0955 100644 --- a/R/import-file-ext.R +++ b/R/import-file-ext.R @@ -24,7 +24,7 @@ import_file_ui <- function(id, if (isTRUE(title)) { title <- shiny::tags$h4( - datamods:::i18n("Import a file"), + "Import a file", class = "datamods-title" ) } @@ -35,7 +35,7 @@ import_file_ui <- function(id, width = 6, shinyWidgets::numericInputIcon( inputId = ns("skip_rows"), - label = datamods:::i18n("Rows to skip before reading data:"), + label = i18n$t("Rows to skip before reading data:"), value = 0, min = 0, icon = list("n ="), @@ -45,20 +45,20 @@ import_file_ui <- function(id, shiny::tagAppendChild( shinyWidgets::textInputIcon( inputId = ns("na_label"), - label = datamods:::i18n("Missing values character(s):"), + label = i18n$t("Missing values character(s):"), value = "NA,,'',na", icon = list("NA"), size = "sm", width = "100%" ), - shiny::helpText(phosphoricons::ph("info"), datamods:::i18n("if several use a comma (',') to separate them")) + shiny::helpText(phosphoricons::ph("info"), i18n$t("if several use a comma (',') to separate them")) ) ), shiny::column( width = 6, shinyWidgets::textInputIcon( inputId = ns("dec"), - label = datamods:::i18n("Decimal separator:"), + label = i18n$t("Decimal separator:"), value = ".", icon = list("0.00"), size = "sm", @@ -66,7 +66,7 @@ import_file_ui <- function(id, ), selectInputIcon( inputId = ns("encoding"), - label = datamods:::i18n("Encoding:"), + label = i18n$t("Encoding:"), choices = c( "UTF-8" = "UTF-8", "Latin1" = "latin1" @@ -81,9 +81,9 @@ import_file_ui <- function(id, file_ui <- shiny::tagAppendAttributes( shiny::fileInput( inputId = ns("file"), - label = datamods:::i18n("Upload a file:"), - buttonLabel = datamods:::i18n("Browse..."), - placeholder = datamods:::i18n("No file selected; maximum file size is 5 mb"), + label = i18n$t("Upload a file:"), + buttonLabel = i18n$t("Browse..."), + placeholder = "No file selected; maximum file size is 5 mb", accept = file_extensions, width = "100%", ## A solution to allow multiple file upload is being considered @@ -130,7 +130,7 @@ import_file_ui <- function(id, id = ns("sheet-container"), shinyWidgets::pickerInput( inputId = ns("sheet"), - label = datamods:::i18n("Select sheet to import:"), + label = i18n$t("Select sheet to import:"), choices = NULL, width = "100%", multiple = TRUE @@ -141,8 +141,11 @@ import_file_ui <- function(id, shinyWidgets::alert( id = ns("import-result"), status = "info", - shiny::tags$b(datamods:::i18n("No file selected:")), - sprintf(datamods:::i18n("You can import %s files"), paste(file_extensions, collapse = ", ")), + shiny::tags$b(i18n$t("No file selected.")), + # shiny::textOutput(ns("trans_format_text")), + # This is the easiest solution, though not gramatically perfect + i18n$t("You can choose between these file types:"), paste(file_extensions,collapse=', '), + # sprintf("You can import %s files", paste(file_extensions, collapse = ", ")), dismissible = TRUE ) ), @@ -173,6 +176,7 @@ import_file_server <- function(id, btn_show_data = TRUE, show_data_in = c("popup", "modal"), trigger_return = c("button", "change"), + file_extensions_text = paste(c(".csv", ".txt", ".xls", ".xlsx", ".rds", ".fst", ".sas7bdat", ".sav"),collapse = ", "), return_class = c("data.frame", "data.table", "tbl_df", "raw"), reset = reactive(NULL)) { read_fns <- list( @@ -206,6 +210,11 @@ import_file_server <- function(id, } }) + # ## Translations + # shiny::observe({ + # output$trans_format_text <- shiny::renderText(glue::glue(i18n$t("You can import {file_extensions_text} files"))) + # }) + shiny::observeEvent(input$file, { ## Several steps are taken to ensure no errors on changed input file temporary_rv$sheets <- 1 @@ -270,7 +279,7 @@ import_file_server <- function(id, if (inherits(imported, "try-error") || NROW(imported) < 1) { datamods:::toggle_widget(inputId = "confirm", enable = FALSE) - datamods:::insert_error(mssg = datamods:::i18n(attr(imported, "condition")$message)) + datamods:::insert_error(mssg = i18n$t(attr(imported, "condition")$message)) temporary_rv$status <- "error" temporary_rv$data <- NULL temporary_rv$name <- NULL @@ -285,7 +294,7 @@ import_file_server <- function(id, imported, trigger_return = trigger_return, btn_show_data = btn_show_data, - extra = if (isTRUE(input$preview_data)) datamods:::i18n("First five rows are shown below:") + extra = if (isTRUE(input$preview_data)) i18n$t("First five rows are shown below:") ) ) temporary_rv$status <- "success" @@ -300,7 +309,7 @@ import_file_server <- function(id, observeEvent(input$see_data, { tryCatch( { - datamods:::show_data(default_parsing(temporary_rv$data), title = datamods:::i18n("Imported data"), type = show_data_in) + datamods:::show_data(default_parsing(temporary_rv$data), title = i18n$t("Imported data"), type = show_data_in) }, # warning = function(warn) { # showNotification(warn, type = "warning") diff --git a/R/sysdata.rda b/R/sysdata.rda index 7544231..31a330e 100644 Binary files a/R/sysdata.rda and b/R/sysdata.rda differ diff --git a/R/translate.R b/R/translate.R new file mode 100644 index 0000000..97ff469 --- /dev/null +++ b/R/translate.R @@ -0,0 +1,8 @@ +language_choices <- function() { + c( + "🇬🇧 English" = "en", + "🇹🇿 Kiswahili" = "sw", + "🇩🇰 Dansk" = "da" + ) +} + diff --git a/R/ui_elements.R b/R/ui_elements.R index 7f851c4..0e33d62 100644 --- a/R/ui_elements.R +++ b/R/ui_elements.R @@ -17,6 +17,10 @@ ui_elements <- function(selection) { # title = shiny::div(htmltools::img(src="FreesearchR-logo-white-nobg-h80.png")), icon = shiny::icon("house"), shiny::fluidRow( + # "The browser language is", + # textOutput("your_lang"), + # p(i18n$t("Hello")), + # shiny::uiOutput(outputId = "language_select"), ## On building the dev-version for shinyapps.io, the dev_banner() is redefined ## Default just output "NULL" ## This could probably be achieved more legantly, but this works. @@ -24,9 +28,12 @@ ui_elements <- function(selection) { shiny::column(width = 2), shiny::column( width = 8, - shiny::markdown(readLines("www/intro.md")), - shiny::column(width = 2) - ) + shiny::uiOutput(outputId = "language_select"), + htmlOutput("intro_text") + # shiny::includeHTML(i18n$t("www/intro.html")) + # shiny::markdown(readLines(i18n$t("www/intro.md"))) + ), + shiny::column(width = 2) ) ), ############################################################################## @@ -35,28 +42,32 @@ ui_elements <- function(selection) { ######### ############################################################################## "import" = bslib::nav_panel( - title = "Get started", + title = i18n$t("Get started"), icon = shiny::icon("play"), value = "nav_import", shiny::fluidRow( shiny::column(width = 2), shiny::column( width = 8, - shiny::h4("Choose your data source"), - shiny::br(), + shiny::h4(i18n$t("Choose your data")), + # shiny::br(), # shiny::uiOutput(outputId = "source"), - shinyWidgets::radioGroupButtons( + # radioGroupButtons( + # inputId = "source", + # selected = "file", + # choices = c("File" = "file"), + # size = "lg" + # ), + shiny::selectInput( inputId = "source", + label="", selected = "file", - choices = c( - "File upload" = "file", - "REDCap server export" = "redcap", - "Local or sample data" = "env" - ), - size = "lg" + choices = "file", + width = "100%" ), - shiny::tags$script('document.querySelector("#source div").style.width = "100%"'), - shiny::helpText("Upload a file from your device, get data directly from REDCap or select a sample data set for testing from the app."), + # shiny::tags$script('document.querySelector("#source div").style.width = "100%"'), + ## Update this to change depending on run locally or hosted + shiny::helpText(i18n$t("Upload a file, get data directly from REDCap or use local or sample data.")), shiny::br(), shiny::br(), shiny::conditionalPanel( @@ -70,13 +81,14 @@ ui_elements <- function(selection) { ), shiny::conditionalPanel( condition = "input.source=='redcap'", - shinyWidgets::alert( - id = "redcap-warning", - status = "info", - shiny::tags$h2(shiny::markdown("Careful with sensitive data")), - shiny::tags$p("The", shiny::tags$i(shiny::tags$b("FreesearchR")), "app only stores data for analyses, but please only use with sensitive data when running locally.", "", shiny::tags$a("Read more here", href = "https://agdamsbo.github.io/FreesearchR/#run-locally-on-your-own-machine"), "."), - dismissible = TRUE - ), + shiny::uiOutput(outputId = "redcap_warning"), + # shinyWidgets::alert( + # id = "redcap-warning", + # status = "warning", + # shiny::tags$h2(i18n$t("Please be mindfull handling sensitive data")), + # shiny::HTML(i18n$t("

The FreesearchR app only stores data for analyses, but please only use with sensitive data when running locally. Read more here

")), + # dismissible = TRUE + # ), m_redcap_readUI( id = "redcap_import", title = "" @@ -95,18 +107,18 @@ ui_elements <- function(selection) { shiny::br(), shiny::actionButton( inputId = "modal_initial_view", - label = "Quick overview", + label = i18n$t("Quick overview"), width = "100%", icon = shiny::icon("binoculars"), disabled = FALSE ), shiny::br(), shiny::br(), - shiny::h5("Select variables for final import"), + shiny::h5(i18n$t("Select variables for final import")), shiny::fluidRow( shiny::column( width = 6, - shiny::p("Exclude incomplete variables:"), + shiny::p(i18n$t("Exclude incomplete variables:")), shiny::br(), shinyWidgets::noUiSliderInput( inputId = "complete_cutoff", @@ -119,12 +131,12 @@ ui_elements <- function(selection) { format = shinyWidgets::wNumbFormat(decimals = 0), color = datamods:::get_primary_color() ), - shiny::helpText("Only include variables missing less observations than the specified percentage."), + shiny::helpText(i18n$t("Only include variables missing less observations than the specified percentage. At 0, only complete variables are included; at 100, all variables are included.")), shiny::br() ), shiny::column( width = 6, - shiny::p("Manual selection:"), + shiny::p(i18n$t("Manual selection:")), shiny::br(), shiny::uiOutput(outputId = "import_var"), shiny::br() @@ -135,12 +147,11 @@ ui_elements <- function(selection) { shiny::br(), shiny::actionButton( inputId = "act_start", - label = "Start", + label = i18n$t("Let's begin!"), width = "100%", icon = shiny::icon("play"), disabled = TRUE ), - shiny::helpText('After importing, hit "Start" or navigate to the desired tab.'), shiny::br(), shiny::br() ), @@ -160,24 +171,23 @@ ui_elements <- function(selection) { icon = shiny::icon("pen-to-square"), value = "nav_prepare", bslib::nav_panel( - title = "Overview and filter", + title = i18n$t("Overview and filter"), icon = shiny::icon("eye"), value = "nav_prepare_overview", - tags$h3("Overview and filtering"), - # validation_ui("validation_col"), + tags$h3(i18n$t("Overview and filtering")), fluidRow( shiny::column( width = 9, shiny::uiOutput(outputId = "data_info", inline = TRUE), shiny::tags$p( - "Below is a short summary table, on the right you can click to visualise data classes or browse data and create different data filters." + i18n$t("Below you find a summary table for quick insigths, and on the right you can visualise data classes, browse data and apply different data filters.") ) ), shiny::column( width = 3, shiny::actionButton( inputId = "modal_visual_overview", - label = "Visual overview", + label = i18n$t("Visual overview"), width = "100%", disabled = TRUE ), @@ -185,7 +195,7 @@ ui_elements <- function(selection) { shiny::br(), shiny::actionButton( inputId = "modal_browse", - label = "Browse data", + label = i18n$t("Browse data"), width = "100%", disabled = TRUE ), @@ -205,21 +215,24 @@ ui_elements <- function(selection) { ), shiny::column( width = 3, - shiny::tags$h6("Filter data types"), + shiny::tags$h6(i18n$t("Filter data types")), shiny::uiOutput( outputId = "column_filter" ), + ## This needs to run in server for translation shiny::helpText("Read more on how ", tags$a( "data types", href = "https://agdamsbo.github.io/FreesearchR/articles/data-types.html", target = "_blank", rel = "noopener noreferrer" ), " are defined."), + validation_ui("validation_var"), shiny::br(), shiny::br(), - shiny::tags$h6("Filter observations"), - shiny::tags$p("Filter on observation level"), + shiny::tags$h6(i18n$t("Filter observations")), + shiny::tags$p(i18n$t("Apply filter on observation")), IDEAFilter::IDEAFilter_ui("data_filter"), + validation_ui("validation_obs"), shiny::br(), shiny::br() ) @@ -229,24 +242,24 @@ ui_elements <- function(selection) { shiny::br() ), bslib::nav_panel( - title = "Modify", + title = i18n$t("Edit and create data"), icon = shiny::icon("file-pen"), - tags$h3("Subset, rename and convert variables"), + tags$h3(i18n$t("Subset, rename and convert variables")), fluidRow( shiny::column( width = 9, shiny::tags$p( - shiny::markdown("Below, are several options for simple data manipulation like update variables by renaming, creating new labels (for nicer tables in the report) and changing variable classes (numeric, factor/categorical etc.)."), - shiny::markdown("There are more advanced options to modify factor/categorical variables as well as create new factor from a continous variable or new variables with *R* code. At the bottom you can restore the original data."), - shiny::markdown("Please note that data modifications are applied before any filtering.") + i18n$t("Below, are several options for simple data manipulation like update variables by renaming, creating new labels (for nicer tables in the report) and changing variable classes (numeric, factor/categorical etc.)."), + i18n$t("There are more advanced options to modify factor/categorical variables as well as create new factor from a continous variable or new variables with R code. At the bottom you can restore the original data."), + i18n$t("Please note that data modifications are applied before any filtering.") ) ) ), update_variables_ui("modal_variables"), shiny::tags$br(), shiny::tags$br(), - shiny::tags$h4("Advanced data manipulation"), - shiny::tags$p("Below options allow more advanced varaible manipulations."), + shiny::tags$h4(i18n$t("Advanced data manipulation")), + shiny::tags$p(i18n$t("Below options allow more advanced varaible manipulations.")), shiny::tags$br(), shiny::tags$br(), shiny::fluidRow( @@ -254,11 +267,11 @@ ui_elements <- function(selection) { width = 4, shiny::actionButton( inputId = "modal_update", - label = "Reorder factor levels", + label = i18n$t("Reorder factor levels"), width = "100%" ), shiny::tags$br(), - shiny::helpText("Reorder the levels of factor/categorical variables."), + shiny::helpText(i18n$t("Reorder the levels of factor/categorical variables.")), shiny::tags$br(), shiny::tags$br() ), @@ -266,11 +279,11 @@ ui_elements <- function(selection) { width = 4, shiny::actionButton( inputId = "modal_cut", - label = "New factor", + label = i18n$t("New factor"), width = "100%" ), shiny::tags$br(), - shiny::helpText("Create factor/categorical variable from a continous variable (number/date/time)."), + shiny::helpText(i18n$t("Create factor/categorical variable from a continous variable (number/date/time).")), shiny::tags$br(), shiny::tags$br() ), @@ -278,30 +291,30 @@ ui_elements <- function(selection) { width = 4, shiny::actionButton( inputId = "modal_column", - label = "New variable", + label = i18n$t("New variable"), width = "100%" ), shiny::tags$br(), - shiny::helpText(shiny::markdown("Create a new variable/column based on an *R*-expression.")), + shiny::helpText(i18n$t("Create a new variable based on an R-expression.")), shiny::tags$br(), shiny::tags$br() ) ), - tags$h4("Compare modified data to original"), + tags$h4(i18n$t("Compare modified data to original")), shiny::tags$br(), shiny::tags$p( - "Raw print of the original vs the modified data." + i18n$t("Raw print of the original vs the modified data.") ), shiny::tags$br(), shiny::fluidRow( shiny::column( width = 6, - shiny::tags$b("Original data:"), + shiny::tags$b(i18n$t("Original data:")), shiny::verbatimTextOutput("original_str") ), shiny::column( width = 6, - shiny::tags$b("Modified data:"), + shiny::tags$b(i18n$t("Modified data:")), shiny::verbatimTextOutput("modified_str") ) ), @@ -431,7 +444,7 @@ ui_elements <- function(selection) { ), ############################################################################## ######### - ######### Download panel + ######### Visuals panel ######### ############################################################################## "visuals" = do.call( @@ -481,11 +494,13 @@ ui_elements <- function(selection) { shiny::column(width = 2), shiny::column( width = 8, + shiny::h4(i18n$t("Analysis validation")), + validation_ui("validation_all"), shiny::fluidRow( shiny::column( width = 6, - shiny::h4("Report"), - shiny::helpText("Choose your favourite output file format for further work, and download, when the analyses are done."), + shiny::h4(i18n$t("Report")), + shiny::helpText(i18n$t("Choose your favourite output file format for further work, and download, when the analyses are done.")), shiny::br(), shiny::br(), shiny::selectInput( @@ -590,13 +605,12 @@ ui_elements <- function(selection) { # shiny::br() # ) ) -if (!is.null(selection)){ - out[[selection]] -} else { - out -} - + if (!is.null(selection)) { + out[[selection]] + } else { + out } +} # ls <- list("home"=1:4, diff --git a/R/update-factor-ext.R b/R/update-factor-ext.R index 014f854..7c1236e 100644 --- a/R/update-factor-ext.R +++ b/R/update-factor-ext.R @@ -33,7 +33,7 @@ update_factor_ui <- function(id) { width = 6, shinyWidgets::virtualSelectInput( inputId = ns("variable"), - label = i18n("Factor variable to reorder:"), + label = i18n$t("Factor variable to reorder:"), choices = NULL, width = "100%", zIndex = 50 @@ -46,7 +46,7 @@ update_factor_ui <- function(id) { inputId = ns("sort_levels"), label = tagList( phosphoricons::ph("sort-ascending"), - datamods:::i18n("Sort by levels") + i18n$t("Sort by levels") ), class = "btn-outline-primary mb-3", width = "100%" @@ -59,7 +59,7 @@ update_factor_ui <- function(id) { inputId = ns("sort_occurrences"), label = tagList( phosphoricons::ph("sort-ascending"), - datamods:::i18n("Sort by count") + i18n$t("Sort by count") ), class = "btn-outline-primary mb-3", width = "100%" @@ -71,7 +71,7 @@ update_factor_ui <- function(id) { class = "float-end", shinyWidgets::prettyCheckbox( inputId = ns("new_var"), - label = datamods:::i18n("Create a new variable (otherwise replaces the one selected)"), + label = i18n$t("Create a new variable (otherwise replaces the one selected)"), value = FALSE, status = "primary", outline = TRUE, @@ -79,7 +79,7 @@ update_factor_ui <- function(id) { ), actionButton( inputId = ns("create"), - label = tagList(phosphoricons::ph("arrow-clockwise"), datamods:::i18n("Update factor variable")), + label = tagList(phosphoricons::ph("arrow-clockwise"), i18n$t("Update factor variable")), class = "btn-outline-primary" ) ), @@ -146,13 +146,13 @@ update_factor_server <- function(id, data_r = reactive(NULL)) { decreasing <- FALSE label <- tagList( phosphoricons::ph("sort-descending"), - datamods:::i18n("Sort count") + i18n$t("Sort count") ) } else { decreasing <- TRUE label <- tagList( phosphoricons::ph("sort-ascending"), - datamods:::i18n("Sort count") + i18n$t("Sort count") ) } updateActionButton(inputId = "sort_occurrences", label = as.character(label)) @@ -179,7 +179,7 @@ update_factor_server <- function(id, data_r = reactive(NULL)) { grid <- grid_columns( grid, columns = c("Var1", "Var1_toset", "Freq"), - header = c(datamods:::i18n("Levels"), "New label", datamods:::i18n("Count")) + header = c(i18n$t("Levels"), "New label", i18n$t("Count")) ) grid <- grid_colorbar( grid, @@ -241,7 +241,7 @@ update_factor_server <- function(id, data_r = reactive(NULL)) { #' #' @rdname update-factor modal_update_factor <- function(id, - title = i18n("Update levels of a factor"), + title = i18n$t("Update levels of a factor"), easyClose = TRUE, size = "l", footer = NULL) { @@ -267,7 +267,7 @@ modal_update_factor <- function(id, #' @importFrom htmltools tagList #' @rdname update-factor winbox_update_factor <- function(id, - title = i18n("Update levels of a factor"), + title = i18n$t("Update levels of a factor"), options = shinyWidgets::wbOptions(), controls = shinyWidgets::wbControls()) { ns <- NS(id) diff --git a/R/update-variables-ext.R b/R/update-variables-ext.R index dbc64f8..e45f527 100644 --- a/R/update-variables-ext.R +++ b/R/update-variables-ext.R @@ -13,7 +13,7 @@ update_variables_ui <- function(id, title = "") { ns <- NS(id) if (isTRUE(title)) { title <- htmltools::tags$h4( - i18n("Update & select variables"), + i18n$t("Update & select variables"), class = "datamods-title" ) } @@ -35,19 +35,19 @@ update_variables_ui <- function(id, title = "") { ), shinyWidgets::textInputIcon( inputId = ns("format"), - label = i18n("Date format:"), + label = i18n$t("Date format:"), value = "%Y-%m-%d", icon = list(phosphoricons::ph("clock")) ), shinyWidgets::textInputIcon( inputId = ns("origin"), - label = i18n("Date to use as origin to convert date/datetime:"), + label = i18n$t("Date to use as origin to convert date/datetime:"), value = "1970-01-01", icon = list(phosphoricons::ph("calendar")) ), shinyWidgets::textInputIcon( inputId = ns("dec"), - label = i18n("Decimal separator:"), + label = i18n$t("Decimal separator:"), value = ".", icon = list("0.00") ) @@ -75,8 +75,8 @@ update_variables_ui <- function(id, title = "") { shiny::actionButton( inputId = ns("validate"), label = htmltools::tagList( - phosphoricons::ph("arrow-circle-right", title = datamods::i18n("Apply changes")), - datamods::i18n("Apply changes") + phosphoricons::ph("arrow-circle-right", title = i18n$t("Apply changes")), + i18n$t("Apply changes") ), width = "100%" ) @@ -115,12 +115,12 @@ update_variables_server <- function(id, output$data_info <- shiny::renderUI({ shiny::req(data_r()) data_description(data_r()) - # sprintf(i18n("Data has %s observations and %s variables."), nrow(data), ncol(data)) + # sprintf(i18n$t("Data has %s observations and %s variables."), nrow(data), ncol(data)) }) variables_r <- shiny::reactive({ shiny::validate( - shiny::need(data(), i18n("No data to display.")) + shiny::need(data(), i18n$t("No data to display.")) ) data <- data_r() if (isTRUE(return_data_on_init)) { @@ -225,7 +225,7 @@ update_variables_server <- function(id, datamods:::insert_alert( selector = ns("update"), status = "success", - tags$b(phosphoricons::ph("check"), datamods::i18n("Data successfully updated!")) + tags$b(phosphoricons::ph("check"), i18n$t("Data successfully updated!")) ) updated_data$x <- data updated_data$list_rename <- list_rename @@ -804,3 +804,4 @@ clean_date <- function(data) { }) |> unname() } +# diff --git a/SESSION.md b/SESSION.md index b7ab925..fc62f43 100644 --- a/SESSION.md +++ b/SESSION.md @@ -11,11 +11,11 @@ |collate |en_US.UTF-8 | |ctype |en_US.UTF-8 | |tz |Europe/Copenhagen | -|date |2025-08-27 | +|date |2025-09-10 | |rstudio |2025.05.0+496 Mariposa Orchid (desktop) | |pandoc |3.6.4 @ /opt/homebrew/bin/ (via rmarkdown) | |quarto |1.7.30 @ /usr/local/bin/quarto | -|FreesearchR |25.8.2.250827 | +|FreesearchR |25.8.3.250910 | -------------------------------------------------------------------------------- @@ -26,8 +26,6 @@ |apexcharter |0.4.4 |2024-09-06 |CRAN (R 4.4.1) | |askpass |1.2.1 |2024-10-04 |CRAN (R 4.4.1) | |assertthat |0.2.1 |2019-03-21 |CRAN (R 4.4.1) | -|attachment |0.4.5 |2025-03-14 |CRAN (R 4.4.1) | -|attempt |0.3.1 |2020-05-03 |CRAN (R 4.4.1) | |backports |1.5.0 |2024-05-23 |CRAN (R 4.4.1) | |base64enc |0.1-3 |2015-07-28 |CRAN (R 4.4.1) | |bayestestR |0.16.1 |2025-07-01 |CRAN (R 4.4.1) | @@ -45,7 +43,6 @@ |cardx |0.2.5 |2025-07-03 |CRAN (R 4.4.1) | |caTools |1.18.3 |2024-09-04 |CRAN (R 4.4.1) | |cellranger |1.1.0 |2016-07-27 |CRAN (R 4.4.0) | -|cffr |1.2.0 |2025-01-25 |CRAN (R 4.4.1) | |checkmate |2.3.2 |2024-07-29 |CRAN (R 4.4.0) | |class |7.3-23 |2025-01-01 |CRAN (R 4.4.1) | |classInt |0.4-11 |2025-01-08 |CRAN (R 4.4.1) | @@ -55,8 +52,6 @@ |colorspace |2.1-1 |2024-07-26 |CRAN (R 4.4.1) | |commonmark |2.0.0 |2025-07-07 |CRAN (R 4.4.1) | |crayon |1.5.3 |2024-06-20 |CRAN (R 4.4.1) | -|credentials |2.0.2 |2024-10-04 |CRAN (R 4.4.1) | -|curl |6.4.0 |2025-06-22 |CRAN (R 4.4.1) | |data.table |1.17.8 |2025-07-10 |CRAN (R 4.4.1) | |datamods |1.5.3 |2024-10-02 |CRAN (R 4.4.1) | |datawizard |1.2.0 |2025-07-17 |CRAN (R 4.4.1) | @@ -65,7 +60,6 @@ |devtools |2.4.5 |2022-10-11 |CRAN (R 4.4.0) | |DHARMa |0.4.7 |2024-10-18 |CRAN (R 4.4.1) | |digest |0.6.37 |2024-08-19 |CRAN (R 4.4.1) | -|dockerfiler |0.2.5 |2025-05-07 |CRAN (R 4.4.1) | |doParallel |1.0.17 |2022-02-07 |CRAN (R 4.4.0) | |dplyr |1.1.4 |2023-11-17 |CRAN (R 4.4.0) | |DT |0.33 |2024-04-04 |CRAN (R 4.4.0) | @@ -88,19 +82,16 @@ |foreach |1.5.2 |2022-02-02 |CRAN (R 4.4.0) | |foreign |0.8-90 |2025-03-31 |CRAN (R 4.4.1) | |Formula |1.2-5 |2023-02-24 |CRAN (R 4.4.1) | -|FreesearchR |25.8.2 |NA |NA | +|FreesearchR |25.8.3 |NA |NA | |fs |1.6.6 |2025-04-12 |CRAN (R 4.4.1) | |gdtools |0.4.2 |2025-03-27 |CRAN (R 4.4.1) | |generics |0.1.4 |2025-05-09 |CRAN (R 4.4.1) | -|gert |2.1.5 |2025-03-25 |CRAN (R 4.4.1) | |ggalluvial |0.12.5 |2023-02-22 |CRAN (R 4.4.0) | |ggcorrplot |0.1.4.1 |2023-09-05 |CRAN (R 4.4.0) | |ggforce |0.5.0 |2025-06-18 |CRAN (R 4.4.1) | |ggplot2 |3.5.2 |2025-04-09 |CRAN (R 4.4.1) | |ggridges |0.5.6 |2024-01-23 |CRAN (R 4.4.0) | |ggstats |0.10.0 |2025-07-02 |CRAN (R 4.4.1) | -|gh |1.5.0 |2025-05-26 |CRAN (R 4.4.1) | -|gitcreds |0.1.2 |2022-09-08 |CRAN (R 4.4.1) | |glue |1.8.0 |2024-09-30 |CRAN (R 4.4.1) | |gridExtra |2.3 |2017-09-09 |CRAN (R 4.4.1) | |gt |1.0.0 |2025-04-05 |CRAN (R 4.4.1) | @@ -114,24 +105,20 @@ |htmltools |0.5.8.1 |2024-04-04 |CRAN (R 4.4.1) | |htmlwidgets |1.6.4 |2023-12-06 |CRAN (R 4.4.0) | |httpuv |1.6.16 |2025-04-16 |CRAN (R 4.4.1) | -|httr2 |1.2.1 |2025-07-22 |CRAN (R 4.4.1) | |IDEAFilter |0.2.1 |2025-07-29 |CRAN (R 4.4.1) | |insight |1.4.0 |2025-08-18 |CRAN (R 4.4.1) | |iterators |1.0.14 |2022-02-05 |CRAN (R 4.4.1) | |jquerylib |0.1.4 |2021-04-26 |CRAN (R 4.4.0) | |jsonlite |2.0.0 |2025-03-27 |CRAN (R 4.4.1) | -|jsonvalidate |1.5.0 |2025-02-07 |CRAN (R 4.4.1) | |KernSmooth |2.23-26 |2025-01-01 |CRAN (R 4.4.1) | |keyring |1.4.1 |2025-06-15 |CRAN (R 4.4.1) | |knitr |1.50 |2025-03-16 |CRAN (R 4.4.1) | |later |1.4.2 |2025-04-08 |CRAN (R 4.4.1) | |lattice |0.22-7 |2025-04-02 |CRAN (R 4.4.1) | |lifecycle |1.0.4 |2023-11-07 |CRAN (R 4.4.1) | -|litedown |0.7 |2025-04-08 |CRAN (R 4.4.1) | |lme4 |1.1-37 |2025-03-26 |CRAN (R 4.4.1) | |lubridate |1.9.4 |2024-12-08 |CRAN (R 4.4.1) | |magrittr |2.0.3 |2022-03-30 |CRAN (R 4.4.1) | -|markdown |2.0 |2025-03-23 |CRAN (R 4.4.1) | |MASS |7.3-65 |2025-02-28 |CRAN (R 4.4.1) | |Matrix |1.7-3 |2025-03-11 |CRAN (R 4.4.1) | |memoise |2.0.1 |2021-11-26 |CRAN (R 4.4.0) | @@ -147,7 +134,6 @@ |opdisDownsampling |1.0.1 |2024-04-15 |CRAN (R 4.4.0) | |openssl |2.3.3 |2025-05-26 |CRAN (R 4.4.1) | |openxlsx2 |1.18 |2025-07-29 |CRAN (R 4.4.1) | -|pak |0.9.0 |2025-05-27 |CRAN (R 4.4.1) | |parameters |0.27.0 |2025-07-09 |CRAN (R 4.4.1) | |patchwork |1.3.1 |2025-06-21 |CRAN (R 4.4.1) | |pbmcapply |1.5.1 |2022-04-28 |CRAN (R 4.4.1) | @@ -169,10 +155,13 @@ |qqconf |1.3.2 |2023-04-14 |CRAN (R 4.4.0) | |qqplotr |0.0.6 |2023-01-25 |CRAN (R 4.4.0) | |quarto |1.5.0 |2025-07-28 |RSPM (R 4.4.0) | +|R.cache |0.17.0 |2025-05-02 |CRAN (R 4.4.1) | +|R.methodsS3 |1.8.2 |2022-06-13 |CRAN (R 4.4.1) | +|R.oo |1.27.1 |2025-05-02 |CRAN (R 4.4.1) | +|R.utils |2.13.0 |2025-02-24 |CRAN (R 4.4.1) | |R6 |2.6.1 |2025-02-15 |CRAN (R 4.4.1) | |ragg |1.4.0 |2025-04-10 |CRAN (R 4.4.1) | |rankinPlot |1.1.0 |2023-01-30 |CRAN (R 4.4.0) | -|rappdirs |0.3.3 |2021-01-31 |CRAN (R 4.4.1) | |rbibutils |2.3 |2024-10-04 |CRAN (R 4.4.1) | |RColorBrewer |1.1-3 |2022-04-03 |CRAN (R 4.4.1) | |Rcpp |1.1.0 |2025-07-02 |CRAN (R 4.4.1) | @@ -203,15 +192,14 @@ |see |0.11.0 |2025-03-11 |CRAN (R 4.4.1) | |sessioninfo |1.2.3 |2025-02-05 |CRAN (R 4.4.1) | |shiny |1.11.1 |2025-07-03 |CRAN (R 4.4.1) | -|shiny.i18n |0.3.0 |NA |NA | -|shiny2docker |0.0.3 |2025-06-28 |CRAN (R 4.4.1) | +|shiny.i18n |0.3.0 |2023-01-16 |CRAN (R 4.4.0) | |shinybusy |0.3.3 |2024-03-09 |CRAN (R 4.4.0) | |shinyjs |2.1.0 |2021-12-23 |CRAN (R 4.4.0) | |shinyTime |1.0.3 |2022-08-19 |CRAN (R 4.4.0) | |shinyWidgets |0.9.0 |2025-02-21 |CRAN (R 4.4.1) | |stringi |1.8.7 |2025-03-27 |CRAN (R 4.4.1) | |stringr |1.5.1 |2023-11-14 |CRAN (R 4.4.0) | -|sys |3.4.3 |2024-10-04 |CRAN (R 4.4.1) | +|styler |1.10.3 |2024-04-07 |CRAN (R 4.4.0) | |systemfonts |1.2.3 |2025-04-30 |CRAN (R 4.4.1) | |testthat |3.2.3 |2025-01-13 |CRAN (R 4.4.1) | |textshaping |1.0.1 |2025-05-01 |CRAN (R 4.4.1) | @@ -227,7 +215,6 @@ |urlchecker |1.0.1 |2021-11-30 |CRAN (R 4.4.1) | |usethis |3.1.0 |2024-11-26 |CRAN (R 4.4.1) | |uuid |1.2-1 |2024-07-29 |CRAN (R 4.4.1) | -|V8 |6.0.6 |2025-08-18 |CRAN (R 4.4.1) | |vctrs |0.6.5 |2023-12-01 |CRAN (R 4.4.0) | |vroom |1.6.5 |2023-12-05 |CRAN (R 4.4.0) | |withr |3.0.2 |2024-10-28 |CRAN (R 4.4.1) | @@ -236,5 +223,4 @@ |xml2 |1.3.8 |2025-03-14 |CRAN (R 4.4.1) | |xtable |1.8-4 |2019-04-21 |CRAN (R 4.4.1) | |yaml |2.3.10 |2024-07-26 |CRAN (R 4.4.1) | -|yesno |0.1.3 |2024-07-26 |CRAN (R 4.4.1) | |zip |2.3.3 |2025-05-13 |CRAN (R 4.4.1) | diff --git a/inst/apps/FreesearchR/app.R b/inst/apps/FreesearchR/app.R index 750e1f8..8b34cef 100644 --- a/inst/apps/FreesearchR/app.R +++ b/inst/apps/FreesearchR/app.R @@ -37,6 +37,12 @@ library(rlang) # library(datamods) # library(toastui) # library(phosphoricons) +library(shiny.i18n) + +## Translation init +i18n <- shiny.i18n::Translator$new(translation_csvs_path = here::here("inst/translations")) + +i18n$set_translation_language("en") ######## @@ -49,7 +55,7 @@ library(rlang) #### Current file: /Users/au301842/FreesearchR/R//app_version.R ######## -app_version <- function()'25.8.1' +app_version <- function()'25.8.3' ######## @@ -407,7 +413,7 @@ create_column_ui <- function(id) { width = 6, textInput( inputId = ns("new_column"), - label = i18n("New column name:"), + label = i18n$t("New column name:"), value = "new_column1", width = "100%" ) @@ -416,7 +422,7 @@ create_column_ui <- function(id) { width = 6, shinyWidgets::virtualSelectInput( inputId = ns("group_by"), - label = i18n("Group calculation by:"), + label = i18n$t("Group calculation by:"), choices = NULL, multiple = TRUE, disableSelectAll = TRUE, @@ -427,7 +433,7 @@ create_column_ui <- function(id) { ), shiny::textAreaInput( inputId = ns("expression"), - label = i18n("Enter an expression to define new column:"), + label = i18n$t("Enter an expression to define new column:"), value = "", width = "100%", rows = 6 @@ -435,7 +441,7 @@ create_column_ui <- function(id) { tags$i( class = "d-block", phosphoricons::ph("info"), - datamods::i18n("Click on a column name to add it to the expression:") + i18n$t("Click on a column name to add it to the expression:") ), uiOutput(outputId = ns("columns")), uiOutput(outputId = ns("feedback")), @@ -449,7 +455,7 @@ create_column_ui <- function(id) { actionButton( inputId = ns("compute"), label = tagList( - phosphoricons::ph("gear"), i18n("Create column") + phosphoricons::ph("gear"), i18n$t("Create column") ), class = "btn-outline-primary", width = "100%" @@ -484,9 +490,9 @@ create_column_server <- function(id, info_alert <- shinyWidgets::alert( status = "info", phosphoricons::ph("question"), - datamods::i18n("Choose a name for the column to be created or modified,"), - datamods::i18n("then enter an expression before clicking on the button above to validate or on "), - phosphoricons::ph("trash"), datamods::i18n("to delete it.") + i18n$t("Choose a name for the column to be created or modified,"), + i18n$t("then enter an expression before clicking on the button above to validate or on "), + phosphoricons::ph("trash"), i18n$t("to delete it.") ) rv <- reactiveValues( @@ -531,7 +537,7 @@ create_column_server <- function(id, if (input$new_column == "") { rv$feedback <- shinyWidgets::alert( status = "warning", - phosphoricons::ph("warning"), datamods::i18n("New column name cannot be empty") + phosphoricons::ph("warning"), i18n$t("New column name cannot be empty") ) } }) @@ -596,7 +602,7 @@ list_allowed_operations <- function() { #' #' @rdname create-column modal_create_column <- function(id, - title = i18n("Create a new column"), + title = i18n$t("Create a new column"), easyClose = TRUE, size = "l", footer = NULL) { @@ -621,7 +627,7 @@ modal_create_column <- function(id, #' @importFrom htmltools tagList #' @rdname create-column winbox_create_column <- function(id, - title = i18n("Create a new column"), + title = i18n$t("Create a new column"), options = shinyWidgets::wbOptions(), controls = shinyWidgets::wbControls()) { ns <- NS(id) @@ -655,7 +661,7 @@ try_compute_column <- function(expression, } funs <- unlist(c(extract_calls(parsed), lapply(parsed, extract_calls)), recursive = TRUE) if (!are_allowed_operations(funs, allowed_operations)) { - return(datamods:::alert_error(datamods::i18n("Some operations are not allowed"))) + return(datamods:::alert_error(i18n$t("Some operations are not allowed"))) } if (!isTruthy(by)) { result <- try( @@ -695,7 +701,7 @@ try_compute_column <- function(expression, ) shinyWidgets::alert( status = "success", - phosphoricons::ph("check"), datamods::i18n("Column added!") + phosphoricons::ph("check"), i18n$t("Column added!") ) } @@ -765,7 +771,7 @@ make_choices_with_infos <- function(data) { # NULL # } description <- if (is.atomic(values)) { - paste(i18n("Unique values:"), data.table::uniqueN(values)) + paste(i18n$t("Unique values:"), data.table::uniqueN(values)) } else { "" } @@ -1189,7 +1195,7 @@ cut_variable_ui <- function(id) { width = 3, shinyWidgets::virtualSelectInput( inputId = ns("variable"), - label = datamods:::i18n("Variable to cut:"), + label = i18n$t("Variable to cut:"), choices = NULL, width = "100%" ) @@ -1202,7 +1208,7 @@ cut_variable_ui <- function(id) { width = 3, numericInput( inputId = ns("n_breaks"), - label = datamods:::i18n("Number of breaks:"), + label = i18n$t("Number of breaks:"), value = 3, min = 2, max = 12, @@ -1213,12 +1219,12 @@ cut_variable_ui <- function(id) { width = 3, checkboxInput( inputId = ns("right"), - label = datamods:::i18n("Close intervals on the right"), + label = i18n$t("Close intervals on the right"), value = TRUE ), checkboxInput( inputId = ns("include_lowest"), - label = datamods:::i18n("Include lowest value"), + label = i18n$t("Include lowest value"), value = TRUE ) ) @@ -1232,7 +1238,7 @@ cut_variable_ui <- function(id) { toastui::datagridOutput2(outputId = ns("count")), actionButton( inputId = ns("create"), - label = tagList(phosphoricons::ph("scissors"), datamods:::i18n("Create factor variable")), + label = tagList(phosphoricons::ph("scissors"), i18n$t("Create factor variable")), class = "btn-outline-primary float-end" ), tags$div(class = "clearfix") @@ -1302,7 +1308,7 @@ cut_variable_server <- function(id, data_r = reactive(NULL)) { shinyWidgets::noUiSliderInput( inputId = session$ns("fixed_brks"), - label = datamods:::i18n("Fixed breaks:"), + label = i18n$t("Fixed breaks:"), min = lower, max = upper, value = brks, @@ -1357,7 +1363,7 @@ cut_variable_server <- function(id, data_r = reactive(NULL)) { shinyWidgets::virtualSelectInput( inputId = session$ns("method"), - label = datamods:::i18n("Method:"), + label = i18n$t("Method:"), choices = choices, selected = NULL, width = "100%" @@ -1551,7 +1557,7 @@ cut_variable_server <- function(id, data_r = reactive(NULL)) { #' #' @rdname cut-variable modal_cut_variable <- function(id, - title = datamods:::i18n("Convert Numeric to Factor"), + title = i18n$t("Convert Numeric to Factor"), easyClose = TRUE, size = "l", footer = NULL) { @@ -3154,14 +3160,14 @@ describe_col_char <- function(x, with_summary = TRUE) { tagList( tags$hr(style = htmltools::css(margin = "3px 0")), tags$div( - datamods:::i18n("Unique:"), length(unique(x)) + i18n$t("Unique:"), length(unique(x)) ), tags$div( - datamods:::i18n("Missing:"), sum(is.na(x)) + i18n$t("Missing:"), sum(is.na(x)) ), tags$div( style = htmltools::css(whiteSpace = "normal", wordBreak = "break-all"), - datamods:::i18n("Most Common:"), gsub( + i18n$t("Most Common:"), gsub( pattern = "'", replacement = "\u07F4", x = names(sort(table(x), decreasing = TRUE))[1] @@ -3203,7 +3209,7 @@ describe_col_factor <- function(x, with_summary = TRUE) { names(two), ":", fmt_p(two, total) ), tags$div( - "Missing", ":", fmt_p(missing, total) + i18n$t("Missing:"), fmt_p(missing, total) ), tags$div( "\u00A0" @@ -3226,16 +3232,16 @@ describe_col_num <- function(x, with_summary = TRUE) { tagList( tags$hr(style = htmltools::css(margin = "3px 0")), tags$div( - datamods:::i18n("Min:"), round(min(x, na.rm = TRUE), 2) + i18n$t("Min:"), round(min(x, na.rm = TRUE), 2) ), tags$div( - datamods:::i18n("Mean:"), round(mean(x, na.rm = TRUE), 2) + i18n$t("Mean:"), round(mean(x, na.rm = TRUE), 2) ), tags$div( - datamods:::i18n("Max:"), round(max(x, na.rm = TRUE), 2) + i18n$t("Max:"), round(max(x, na.rm = TRUE), 2) ), tags$div( - datamods:::i18n("Missing:"), sum(is.na(x)) + i18n$t("Missing:"), sum(is.na(x)) ) ) } @@ -3256,13 +3262,13 @@ describe_col_date <- function(x, with_summary = TRUE) { tagList( tags$hr(style = htmltools::css(margin = "3px 0")), tags$div( - datamods:::i18n("Min:"), min(x, na.rm = TRUE) + i18n$t("Min:"), min(x, na.rm = TRUE) ), tags$div( - datamods:::i18n("Max:"), max(x, na.rm = TRUE) + i18n$t("Max:"), max(x, na.rm = TRUE) ), tags$div( - datamods:::i18n("Missing:"), sum(is.na(x)) + i18n$t("Missing:"), sum(is.na(x)) ), tags$div( "\u00A0" @@ -3285,13 +3291,13 @@ describe_col_datetime <- function(x, with_summary = TRUE) { tagList( tags$hr(style = htmltools::css(margin = "3px 0")), tags$div( - datamods:::i18n("Min:"), min(x, na.rm = TRUE) + i18n$t("Min:"), min(x, na.rm = TRUE) ), tags$div( - datamods:::i18n("Max:"), max(x, na.rm = TRUE) + i18n$t("Max:"), max(x, na.rm = TRUE) ), tags$div( - datamods:::i18n("Missing:"), sum(is.na(x)) + i18n$t("Missing:"), sum(is.na(x)) ), tags$div( "\u00A0" @@ -3315,10 +3321,10 @@ describe_col_other <- function(x, with_summary = TRUE) { tagList( tags$hr(style = htmltools::css(margin = "3px 0")), tags$div( - datamods:::i18n("Unique:"), length(unique(x)) + i18n$t("Unique:"), length(unique(x)) ), tags$div( - datamods:::i18n("Missing:"), sum(is.na(x)) + i18n$t("Missing:"), sum(is.na(x)) ), tags$div( "\u00A0" @@ -4047,7 +4053,7 @@ simple_snake <- function(data){ #### Current file: /Users/au301842/FreesearchR/R//hosted_version.R ######## -hosted_version <- function()'v25.8.1-250827' +hosted_version <- function()'v25.8.3-250910' ######## @@ -4095,7 +4101,7 @@ import_file_ui <- function(id, if (isTRUE(title)) { title <- shiny::tags$h4( - datamods:::i18n("Import a file"), + "Import a file", class = "datamods-title" ) } @@ -4106,7 +4112,7 @@ import_file_ui <- function(id, width = 6, shinyWidgets::numericInputIcon( inputId = ns("skip_rows"), - label = datamods:::i18n("Rows to skip before reading data:"), + label = i18n$t("Rows to skip before reading data:"), value = 0, min = 0, icon = list("n ="), @@ -4116,20 +4122,20 @@ import_file_ui <- function(id, shiny::tagAppendChild( shinyWidgets::textInputIcon( inputId = ns("na_label"), - label = datamods:::i18n("Missing values character(s):"), + label = i18n$t("Missing values character(s):"), value = "NA,,'',na", icon = list("NA"), size = "sm", width = "100%" ), - shiny::helpText(phosphoricons::ph("info"), datamods:::i18n("if several use a comma (',') to separate them")) + shiny::helpText(phosphoricons::ph("info"), i18n$t("if several use a comma (',') to separate them")) ) ), shiny::column( width = 6, shinyWidgets::textInputIcon( inputId = ns("dec"), - label = datamods:::i18n("Decimal separator:"), + label = i18n$t("Decimal separator:"), value = ".", icon = list("0.00"), size = "sm", @@ -4137,7 +4143,7 @@ import_file_ui <- function(id, ), selectInputIcon( inputId = ns("encoding"), - label = datamods:::i18n("Encoding:"), + label = i18n$t("Encoding:"), choices = c( "UTF-8" = "UTF-8", "Latin1" = "latin1" @@ -4152,9 +4158,9 @@ import_file_ui <- function(id, file_ui <- shiny::tagAppendAttributes( shiny::fileInput( inputId = ns("file"), - label = datamods:::i18n("Upload a file:"), - buttonLabel = datamods:::i18n("Browse..."), - placeholder = datamods:::i18n("No file selected; maximum file size is 5 mb"), + label = i18n$t("Upload a file:"), + buttonLabel = i18n$t("Browse..."), + placeholder = "No file selected; maximum file size is 5 mb", accept = file_extensions, width = "100%", ## A solution to allow multiple file upload is being considered @@ -4201,7 +4207,7 @@ import_file_ui <- function(id, id = ns("sheet-container"), shinyWidgets::pickerInput( inputId = ns("sheet"), - label = datamods:::i18n("Select sheet to import:"), + label = i18n$t("Select sheet to import:"), choices = NULL, width = "100%", multiple = TRUE @@ -4212,8 +4218,11 @@ import_file_ui <- function(id, shinyWidgets::alert( id = ns("import-result"), status = "info", - shiny::tags$b(datamods:::i18n("No file selected:")), - sprintf(datamods:::i18n("You can import %s files"), paste(file_extensions, collapse = ", ")), + shiny::tags$b(i18n$t("No file selected.")), + # shiny::textOutput(ns("trans_format_text")), + # This is the easiest solution, though not gramatically perfect + i18n$t("You can choose between these file types:"), paste(file_extensions,collapse=', '), + # sprintf("You can import %s files", paste(file_extensions, collapse = ", ")), dismissible = TRUE ) ), @@ -4244,6 +4253,7 @@ import_file_server <- function(id, btn_show_data = TRUE, show_data_in = c("popup", "modal"), trigger_return = c("button", "change"), + file_extensions_text = paste(c(".csv", ".txt", ".xls", ".xlsx", ".rds", ".fst", ".sas7bdat", ".sav"),collapse = ", "), return_class = c("data.frame", "data.table", "tbl_df", "raw"), reset = reactive(NULL)) { read_fns <- list( @@ -4277,6 +4287,11 @@ import_file_server <- function(id, } }) + # ## Translations + # shiny::observe({ + # output$trans_format_text <- shiny::renderText(glue::glue(i18n$t("You can import {file_extensions_text} files"))) + # }) + shiny::observeEvent(input$file, { ## Several steps are taken to ensure no errors on changed input file temporary_rv$sheets <- 1 @@ -4341,7 +4356,7 @@ import_file_server <- function(id, if (inherits(imported, "try-error") || NROW(imported) < 1) { datamods:::toggle_widget(inputId = "confirm", enable = FALSE) - datamods:::insert_error(mssg = datamods:::i18n(attr(imported, "condition")$message)) + datamods:::insert_error(mssg = i18n$t(attr(imported, "condition")$message)) temporary_rv$status <- "error" temporary_rv$data <- NULL temporary_rv$name <- NULL @@ -4356,7 +4371,7 @@ import_file_server <- function(id, imported, trigger_return = trigger_return, btn_show_data = btn_show_data, - extra = if (isTRUE(input$preview_data)) datamods:::i18n("First five rows are shown below:") + extra = if (isTRUE(input$preview_data)) i18n$t("First five rows are shown below:") ) ) temporary_rv$status <- "success" @@ -4371,7 +4386,7 @@ import_file_server <- function(id, observeEvent(input$see_data, { tryCatch( { - datamods:::show_data(default_parsing(temporary_rv$data), title = datamods:::i18n("Imported data"), type = show_data_in) + datamods:::show_data(default_parsing(temporary_rv$data), title = i18n$t("Imported data"), type = show_data_in) }, # warning = function(warn) { # showNotification(warn, type = "warning") @@ -8321,6 +8336,20 @@ gg_theme_export <- function() { } +######## +#### Current file: /Users/au301842/FreesearchR/R//translate.R +######## + +language_choices <- function() { + c( + "🇬🇧 English" = "en", + "🇹🇿 Kiswahili" = "sw", + "🇩🇰 Dansk" = "da" + ) +} + + + ######## #### Current file: /Users/au301842/FreesearchR/R//ui_elements.R ######## @@ -8344,6 +8373,10 @@ ui_elements <- function(selection) { # title = shiny::div(htmltools::img(src="FreesearchR-logo-white-nobg-h80.png")), icon = shiny::icon("house"), shiny::fluidRow( + # "The browser language is", + # textOutput("your_lang"), + # p(i18n$t("Hello")), + # shiny::uiOutput(outputId = "language_select"), ## On building the dev-version for shinyapps.io, the dev_banner() is redefined ## Default just output "NULL" ## This could probably be achieved more legantly, but this works. @@ -8351,9 +8384,12 @@ ui_elements <- function(selection) { shiny::column(width = 2), shiny::column( width = 8, - shiny::markdown(readLines("www/intro.md")), - shiny::column(width = 2) - ) + shiny::uiOutput(outputId = "language_select"), + htmlOutput("intro_text") + # shiny::includeHTML(i18n$t("www/intro.html")) + # shiny::markdown(readLines(i18n$t("www/intro.md"))) + ), + shiny::column(width = 2) ) ), ############################################################################## @@ -8362,28 +8398,32 @@ ui_elements <- function(selection) { ######### ############################################################################## "import" = bslib::nav_panel( - title = "Get started", + title = i18n$t("Get started"), icon = shiny::icon("play"), value = "nav_import", shiny::fluidRow( shiny::column(width = 2), shiny::column( width = 8, - shiny::h4("Choose your data source"), - shiny::br(), + shiny::h4(i18n$t("Choose your data")), + # shiny::br(), # shiny::uiOutput(outputId = "source"), - shinyWidgets::radioGroupButtons( + # radioGroupButtons( + # inputId = "source", + # selected = "file", + # choices = c("File" = "file"), + # size = "lg" + # ), + shiny::selectInput( inputId = "source", + label="", selected = "file", - choices = c( - "File upload" = "file", - "REDCap server export" = "redcap", - "Local or sample data" = "env" - ), - size = "lg" + choices = "file", + width = "100%" ), - shiny::tags$script('document.querySelector("#source div").style.width = "100%"'), - shiny::helpText("Upload a file from your device, get data directly from REDCap or select a sample data set for testing from the app."), + # shiny::tags$script('document.querySelector("#source div").style.width = "100%"'), + ## Update this to change depending on run locally or hosted + shiny::helpText(i18n$t("Upload a file, get data directly from REDCap or use local or sample data.")), shiny::br(), shiny::br(), shiny::conditionalPanel( @@ -8397,13 +8437,14 @@ ui_elements <- function(selection) { ), shiny::conditionalPanel( condition = "input.source=='redcap'", - shinyWidgets::alert( - id = "redcap-warning", - status = "info", - shiny::tags$h2(shiny::markdown("Careful with sensitive data")), - shiny::tags$p("The", shiny::tags$i(shiny::tags$b("FreesearchR")), "app only stores data for analyses, but please only use with sensitive data when running locally.", "", shiny::tags$a("Read more here", href = "https://agdamsbo.github.io/FreesearchR/#run-locally-on-your-own-machine"), "."), - dismissible = TRUE - ), + shiny::uiOutput(outputId = "redcap_warning"), + # shinyWidgets::alert( + # id = "redcap-warning", + # status = "warning", + # shiny::tags$h2(i18n$t("Please be mindfull handling sensitive data")), + # shiny::HTML(i18n$t("

The FreesearchR app only stores data for analyses, but please only use with sensitive data when running locally. Read more here

")), + # dismissible = TRUE + # ), m_redcap_readUI( id = "redcap_import", title = "" @@ -8422,18 +8463,18 @@ ui_elements <- function(selection) { shiny::br(), shiny::actionButton( inputId = "modal_initial_view", - label = "Quick overview", + label = i18n$t("Quick overview"), width = "100%", icon = shiny::icon("binoculars"), disabled = FALSE ), shiny::br(), shiny::br(), - shiny::h5("Select variables for final import"), + shiny::h5(i18n$t("Select variables for final import")), shiny::fluidRow( shiny::column( width = 6, - shiny::p("Exclude incomplete variables:"), + shiny::p(i18n$t("Exclude incomplete variables:")), shiny::br(), shinyWidgets::noUiSliderInput( inputId = "complete_cutoff", @@ -8446,12 +8487,12 @@ ui_elements <- function(selection) { format = shinyWidgets::wNumbFormat(decimals = 0), color = datamods:::get_primary_color() ), - shiny::helpText("Only include variables missing less observations than the specified percentage."), + shiny::helpText(i18n$t("Only include variables missing less observations than the specified percentage. At 0, only complete variables are included; at 100, all variables are included.")), shiny::br() ), shiny::column( width = 6, - shiny::p("Manual selection:"), + shiny::p(i18n$t("Manual selection:")), shiny::br(), shiny::uiOutput(outputId = "import_var"), shiny::br() @@ -8462,12 +8503,11 @@ ui_elements <- function(selection) { shiny::br(), shiny::actionButton( inputId = "act_start", - label = "Start", + label = i18n$t("Let's begin!"), width = "100%", icon = shiny::icon("play"), disabled = TRUE ), - shiny::helpText('After importing, hit "Start" or navigate to the desired tab.'), shiny::br(), shiny::br() ), @@ -8487,24 +8527,23 @@ ui_elements <- function(selection) { icon = shiny::icon("pen-to-square"), value = "nav_prepare", bslib::nav_panel( - title = "Overview and filter", + title = i18n$t("Overview and filter"), icon = shiny::icon("eye"), value = "nav_prepare_overview", - tags$h3("Overview and filtering"), - # validation_ui("validation_col"), + tags$h3(i18n$t("Overview and filtering")), fluidRow( shiny::column( width = 9, shiny::uiOutput(outputId = "data_info", inline = TRUE), shiny::tags$p( - "Below is a short summary table, on the right you can click to visualise data classes or browse data and create different data filters." + i18n$t("Below you find a summary table for quick insigths, and on the right you can visualise data classes, browse data and apply different data filters.") ) ), shiny::column( width = 3, shiny::actionButton( inputId = "modal_visual_overview", - label = "Visual overview", + label = i18n$t("Visual overview"), width = "100%", disabled = TRUE ), @@ -8512,7 +8551,7 @@ ui_elements <- function(selection) { shiny::br(), shiny::actionButton( inputId = "modal_browse", - label = "Browse data", + label = i18n$t("Browse data"), width = "100%", disabled = TRUE ), @@ -8532,21 +8571,24 @@ ui_elements <- function(selection) { ), shiny::column( width = 3, - shiny::tags$h6("Filter data types"), + shiny::tags$h6(i18n$t("Filter data types")), shiny::uiOutput( outputId = "column_filter" ), + ## This needs to run in server for translation shiny::helpText("Read more on how ", tags$a( "data types", href = "https://agdamsbo.github.io/FreesearchR/articles/data-types.html", target = "_blank", rel = "noopener noreferrer" ), " are defined."), + validation_ui("validation_var"), shiny::br(), shiny::br(), - shiny::tags$h6("Filter observations"), - shiny::tags$p("Filter on observation level"), + shiny::tags$h6(i18n$t("Filter observations")), + shiny::tags$p(i18n$t("Apply filter on observation")), IDEAFilter::IDEAFilter_ui("data_filter"), + validation_ui("validation_obs"), shiny::br(), shiny::br() ) @@ -8556,24 +8598,24 @@ ui_elements <- function(selection) { shiny::br() ), bslib::nav_panel( - title = "Modify", + title = i18n$t("Edit and create data"), icon = shiny::icon("file-pen"), - tags$h3("Subset, rename and convert variables"), + tags$h3(i18n$t("Subset, rename and convert variables")), fluidRow( shiny::column( width = 9, shiny::tags$p( - shiny::markdown("Below, are several options for simple data manipulation like update variables by renaming, creating new labels (for nicer tables in the report) and changing variable classes (numeric, factor/categorical etc.)."), - shiny::markdown("There are more advanced options to modify factor/categorical variables as well as create new factor from a continous variable or new variables with *R* code. At the bottom you can restore the original data."), - shiny::markdown("Please note that data modifications are applied before any filtering.") + i18n$t("Below, are several options for simple data manipulation like update variables by renaming, creating new labels (for nicer tables in the report) and changing variable classes (numeric, factor/categorical etc.)."), + i18n$t("There are more advanced options to modify factor/categorical variables as well as create new factor from a continous variable or new variables with R code. At the bottom you can restore the original data."), + i18n$t("Please note that data modifications are applied before any filtering.") ) ) ), update_variables_ui("modal_variables"), shiny::tags$br(), shiny::tags$br(), - shiny::tags$h4("Advanced data manipulation"), - shiny::tags$p("Below options allow more advanced varaible manipulations."), + shiny::tags$h4(i18n$t("Advanced data manipulation")), + shiny::tags$p(i18n$t("Below options allow more advanced varaible manipulations.")), shiny::tags$br(), shiny::tags$br(), shiny::fluidRow( @@ -8581,11 +8623,11 @@ ui_elements <- function(selection) { width = 4, shiny::actionButton( inputId = "modal_update", - label = "Reorder factor levels", + label = i18n$t("Reorder factor levels"), width = "100%" ), shiny::tags$br(), - shiny::helpText("Reorder the levels of factor/categorical variables."), + shiny::helpText(i18n$t("Reorder the levels of factor/categorical variables.")), shiny::tags$br(), shiny::tags$br() ), @@ -8593,11 +8635,11 @@ ui_elements <- function(selection) { width = 4, shiny::actionButton( inputId = "modal_cut", - label = "New factor", + label = i18n$t("New factor"), width = "100%" ), shiny::tags$br(), - shiny::helpText("Create factor/categorical variable from a continous variable (number/date/time)."), + shiny::helpText(i18n$t("Create factor/categorical variable from a continous variable (number/date/time).")), shiny::tags$br(), shiny::tags$br() ), @@ -8605,30 +8647,30 @@ ui_elements <- function(selection) { width = 4, shiny::actionButton( inputId = "modal_column", - label = "New variable", + label = i18n$t("New variable"), width = "100%" ), shiny::tags$br(), - shiny::helpText(shiny::markdown("Create a new variable/column based on an *R*-expression.")), + shiny::helpText(i18n$t("Create a new variable based on an R-expression.")), shiny::tags$br(), shiny::tags$br() ) ), - tags$h4("Compare modified data to original"), + tags$h4(i18n$t("Compare modified data to original")), shiny::tags$br(), shiny::tags$p( - "Raw print of the original vs the modified data." + i18n$t("Raw print of the original vs the modified data.") ), shiny::tags$br(), shiny::fluidRow( shiny::column( width = 6, - shiny::tags$b("Original data:"), + shiny::tags$b(i18n$t("Original data:")), shiny::verbatimTextOutput("original_str") ), shiny::column( width = 6, - shiny::tags$b("Modified data:"), + shiny::tags$b(i18n$t("Modified data:")), shiny::verbatimTextOutput("modified_str") ) ), @@ -8758,7 +8800,7 @@ ui_elements <- function(selection) { ), ############################################################################## ######### - ######### Download panel + ######### Visuals panel ######### ############################################################################## "visuals" = do.call( @@ -8808,11 +8850,13 @@ ui_elements <- function(selection) { shiny::column(width = 2), shiny::column( width = 8, + shiny::h4(i18n$t("Analysis validation")), + validation_ui("validation_all"), shiny::fluidRow( shiny::column( width = 6, - shiny::h4("Report"), - shiny::helpText("Choose your favourite output file format for further work, and download, when the analyses are done."), + shiny::h4(i18n$t("Report")), + shiny::helpText(i18n$t("Choose your favourite output file format for further work, and download, when the analyses are done.")), shiny::br(), shiny::br(), shiny::selectInput( @@ -8917,13 +8961,12 @@ ui_elements <- function(selection) { # shiny::br() # ) ) -if (!is.null(selection)){ - out[[selection]] -} else { - out -} - + if (!is.null(selection)) { + out[[selection]] + } else { + out } +} # ls <- list("home"=1:4, @@ -8970,7 +9013,7 @@ update_factor_ui <- function(id) { width = 6, shinyWidgets::virtualSelectInput( inputId = ns("variable"), - label = i18n("Factor variable to reorder:"), + label = i18n$t("Factor variable to reorder:"), choices = NULL, width = "100%", zIndex = 50 @@ -8983,7 +9026,7 @@ update_factor_ui <- function(id) { inputId = ns("sort_levels"), label = tagList( phosphoricons::ph("sort-ascending"), - datamods:::i18n("Sort by levels") + i18n$t("Sort by levels") ), class = "btn-outline-primary mb-3", width = "100%" @@ -8996,7 +9039,7 @@ update_factor_ui <- function(id) { inputId = ns("sort_occurrences"), label = tagList( phosphoricons::ph("sort-ascending"), - datamods:::i18n("Sort by count") + i18n$t("Sort by count") ), class = "btn-outline-primary mb-3", width = "100%" @@ -9008,7 +9051,7 @@ update_factor_ui <- function(id) { class = "float-end", shinyWidgets::prettyCheckbox( inputId = ns("new_var"), - label = datamods:::i18n("Create a new variable (otherwise replaces the one selected)"), + label = i18n$t("Create a new variable (otherwise replaces the one selected)"), value = FALSE, status = "primary", outline = TRUE, @@ -9016,7 +9059,7 @@ update_factor_ui <- function(id) { ), actionButton( inputId = ns("create"), - label = tagList(phosphoricons::ph("arrow-clockwise"), datamods:::i18n("Update factor variable")), + label = tagList(phosphoricons::ph("arrow-clockwise"), i18n$t("Update factor variable")), class = "btn-outline-primary" ) ), @@ -9083,13 +9126,13 @@ update_factor_server <- function(id, data_r = reactive(NULL)) { decreasing <- FALSE label <- tagList( phosphoricons::ph("sort-descending"), - datamods:::i18n("Sort count") + i18n$t("Sort count") ) } else { decreasing <- TRUE label <- tagList( phosphoricons::ph("sort-ascending"), - datamods:::i18n("Sort count") + i18n$t("Sort count") ) } updateActionButton(inputId = "sort_occurrences", label = as.character(label)) @@ -9116,7 +9159,7 @@ update_factor_server <- function(id, data_r = reactive(NULL)) { grid <- grid_columns( grid, columns = c("Var1", "Var1_toset", "Freq"), - header = c(datamods:::i18n("Levels"), "New label", datamods:::i18n("Count")) + header = c(i18n$t("Levels"), "New label", i18n$t("Count")) ) grid <- grid_colorbar( grid, @@ -9178,7 +9221,7 @@ update_factor_server <- function(id, data_r = reactive(NULL)) { #' #' @rdname update-factor modal_update_factor <- function(id, - title = i18n("Update levels of a factor"), + title = i18n$t("Update levels of a factor"), easyClose = TRUE, size = "l", footer = NULL) { @@ -9204,7 +9247,7 @@ modal_update_factor <- function(id, #' @importFrom htmltools tagList #' @rdname update-factor winbox_update_factor <- function(id, - title = i18n("Update levels of a factor"), + title = i18n$t("Update levels of a factor"), options = shinyWidgets::wbOptions(), controls = shinyWidgets::wbControls()) { ns <- NS(id) @@ -9247,7 +9290,7 @@ update_variables_ui <- function(id, title = "") { ns <- NS(id) if (isTRUE(title)) { title <- htmltools::tags$h4( - i18n("Update & select variables"), + i18n$t("Update & select variables"), class = "datamods-title" ) } @@ -9269,19 +9312,19 @@ update_variables_ui <- function(id, title = "") { ), shinyWidgets::textInputIcon( inputId = ns("format"), - label = i18n("Date format:"), + label = i18n$t("Date format:"), value = "%Y-%m-%d", icon = list(phosphoricons::ph("clock")) ), shinyWidgets::textInputIcon( inputId = ns("origin"), - label = i18n("Date to use as origin to convert date/datetime:"), + label = i18n$t("Date to use as origin to convert date/datetime:"), value = "1970-01-01", icon = list(phosphoricons::ph("calendar")) ), shinyWidgets::textInputIcon( inputId = ns("dec"), - label = i18n("Decimal separator:"), + label = i18n$t("Decimal separator:"), value = ".", icon = list("0.00") ) @@ -9309,8 +9352,8 @@ update_variables_ui <- function(id, title = "") { shiny::actionButton( inputId = ns("validate"), label = htmltools::tagList( - phosphoricons::ph("arrow-circle-right", title = datamods::i18n("Apply changes")), - datamods::i18n("Apply changes") + phosphoricons::ph("arrow-circle-right", title = i18n$t("Apply changes")), + i18n$t("Apply changes") ), width = "100%" ) @@ -9349,12 +9392,12 @@ update_variables_server <- function(id, output$data_info <- shiny::renderUI({ shiny::req(data_r()) data_description(data_r()) - # sprintf(i18n("Data has %s observations and %s variables."), nrow(data), ncol(data)) + # sprintf(i18n$t("Data has %s observations and %s variables."), nrow(data), ncol(data)) }) variables_r <- shiny::reactive({ shiny::validate( - shiny::need(data(), i18n("No data to display.")) + shiny::need(data(), i18n$t("No data to display.")) ) data <- data_r() if (isTRUE(return_data_on_init)) { @@ -9459,7 +9502,7 @@ update_variables_server <- function(id, datamods:::insert_alert( selector = ns("update"), status = "success", - tags$b(phosphoricons::ph("check"), datamods::i18n("Data successfully updated!")) + tags$b(phosphoricons::ph("check"), i18n$t("Data successfully updated!")) ) updated_data$x <- data updated_data$list_rename <- list_rename @@ -10038,6 +10081,403 @@ clean_date <- function(data) { }) |> unname() } +# + + +######## +#### Current file: /Users/au301842/FreesearchR/R//validation.R +######## + +# Description of warning with text description incl metric +# Color coded (green (OK) or yellow (WARNING)) +# option to ignore/accept warnings ### to simplify things, this is gone for now ### +# Only show warnings based on performed analyses + +## 250825 +## Works in demo +## Not alert is printed in app interface +## I believe it comes down to the reactivity + + +######################################################################## +############# Server and UI +######################################################################## + +#' @title Validation module +#' +#' @description Check that a dataset respect some validation expectations. +#' +#' @param id Module's ID. +#' @param max_height Maximum height for validation results element, useful if you have many rules. +#' @param ... Arguments passed to \code{actionButton} or \code{uiOutput} depending on display mode, +#' you cannot use \code{inputId}/\code{outputId}, \code{label} or \code{icon} (button only). +#' +#' @return +#' * UI: HTML tags that can be included in shiny's UI +#' * Server: a \code{list} with two slots: +#' + **status**: a \code{reactive} function returning the best status available between \code{"OK"}, \code{"Failed"} or \code{"Error"}. +#' + **details**: a \code{reactive} function returning a \code{list} with validation details. +#' @export +#' +#' @rdname validation +#' +#' @example examples/validation_module_demo.R +validation_ui <- function(id, max_height = NULL, ...) { + ns <- shiny::NS(id) + + max_height <- if (!is.null(max_height)) { + paste0("overflow-y: auto; max-height:", htmltools::validateCssUnit(max_height), ";") + } + + ui <- shiny::uiOutput( + outputId = ns("results"), + ..., + style = max_height + ) + + htmltools::tagList( + ui, datamods:::html_dependency_datamods() + ) +} + +#' @export +#' +#' @param data a \code{reactive} function returning a \code{data.frame}. +#' +#' @rdname validation +#' +validation_server <- function(id, + data) { + moduleServer( + id = id, + module = function(input, output, session) { + valid_ui <- reactiveValues(x = NULL) + + data_r <- if (shiny::is.reactive(data)) data else shiny::reactive(data) + + # observeEvent(data_r(), { + # to_validate <- data() + # valid_dims <- check_data(to_validate, n_row = n_row, n_col = n_col) + # + # if (all(c(valid_dims$nrows, valid_dims$ncols))) { + # valid_status <- "OK" + # } else { + # valid_status <- "Failed" + # } + # + # valid_results <- lapply( + # X = c("nrows", "ncols"), + # FUN = function(x) { + # if (is.null(valid_dims[[x]])) + # return(NULL) + # label <- switch( + # x, + # "nrows" = n_row_label, + # "ncols" = n_col_label + # ) + # list( + # status = ifelse(valid_dims[[x]], "OK", "Failed"), + # label = paste0("", label, "") + # ) + # } + # ) + + shiny::observeEvent( + data_r(), + { + # browser() + to_validate <- data_r() + if (is.reactivevalues(to_validate)) + out <- lapply( + reactiveValuesToList(to_validate), + make_validation_alerts) |> + purrr::list_flatten() + + if (length(to_validate) > 0) { + out <- make_validation_alerts(to_validate) + } + valid_ui$x <- tagList(out) + } + ) + + output$results <- renderUI({ + valid_ui$x + }) + } + ) +} + + +######################################################################## +############# Validation functions +######################################################################## + +#' Dimensions validation +#' +#' @param before data before +#' @param after data after +#' @param fun dimension function. ncol or nrow +#' +#' @returns data.frame +#' +dim_change_call <- function(before, after, fun) { + # browser() + if (!0 %in% c(dim(before), dim(after))) { + n_before <- fun(before) + n_after <- fun(after) + n_out <- n_before - n_after + p_after <- n_after / fun(before) * 100 + p_out <- 100 - p_after + + data.frame( + n_before = n_before, + n_after = n_after, + n_out = n_out, + p_after = p_after, + p_out = p_out + ) |> + dplyr::mutate( + dplyr::across( + dplyr::where( + is.numeric + ), + \(.y) round(.y, 0) + ) + ) + } else { + data.frame(NULL) + } +} + +#' Variable filter test wrapper +#' +#' @param before data before +#' @param after data after +#' +#' @returns vector +#' +#' @examples +#' vars_filter_validate(mtcars, mtcars[1:6]) +#' vars_filter_validate(mtcars, mtcars[0]) +vars_filter_validate <- function(before, after) { + dim_change_call(before, after, ncol) +} + +#' Observations filter test wrapper +#' +#' @param before data before +#' @param after data after +#' +#' @returns vector +#' +obs_filter_validate <- function(before, after) { + dim_change_call(before, after, nrow) +} + +#' Validate function of missingness in data +#' +#' @param data data set +#' +#' @returns data.frame +#' @export +#' +#' @examples +#' df <- mtcars +#' df[1,2:4] <- NA +#' missings_validate(df) +missings_validate <- function(data){ + if (!0 %in% dim(data)) { + # browser() + p_miss <- sum(is.na(data))/prod(dim(data))*100 + data.frame( + p_miss = p_miss + ) |> + dplyr::mutate( + dplyr::across( + dplyr::where( + is.numeric + ), + \(.y) signif(.y, 2) + ) + ) + } else { + data.frame(NULL) + } +} + + +######################################################################## +############# Collected validation functions in a library-like function +######################################################################## + + +#' Validation library +#' +#' @param name Index name +#' +#' @returns list +#' +#' @examples +#' validation_lib() +#' validation_lib("missings") +validation_lib <- function(name=NULL) { + ls <- list( + "obs_filter" = function(x, y) { + ## Validation function for observations filter + list( + string = i18n$t("You removed {p_out} % of observations."), + summary.fun = obs_filter_validate, + summary.fun.args = list( + before = x, + after = y + ), + test.fun = function(x, var, cut) { + test.var <- x[var] + ifelse(test.var > cut, "warning", "succes") + }, + test.fun.args = list(var = "p_out", cut = 50) + ) + }, + "var_filter" = function(x, y) { + ## Validation function for variables filter + list( + string = i18n$t("You removed {p_out} % of variables."), + summary.fun = vars_filter_validate, + summary.fun.args = list( + before = x, + after = y + ), + test.fun = function(x, var, cut) { + test.var <- x[var] + ifelse(test.var > cut, "warning", "succes") + }, + test.fun.args = list(var = "p_out", cut = 50) + ) + }, + "missings" = function(x, y) { + ### Placeholder for missingness validation + list( + string = "There are {p_miss} % missing observations.", + summary.fun = missings_validate, + summary.fun.args = list( + data = x + ), + test.fun = function(x, var, cut) { + test.var <- x[var] + ifelse(test.var > cut, "warning", "succes") + }, + test.fun.args = list(var = "p_miss", cut = 30) + ) + } + ) + + if (!is.null(name)){ + name <- match.arg(name,choices = names(ls)) + ls[[name]] + } else { + ls + } +} + + +######################################################################## +############# Validation creation +######################################################################## + +#' Create validation data.frame +#' +#' @param ls validation list +#' @param ... magic dots +#' +#' @returns data.frame +#' @export +#' +#' @examples +#' i18n <- shiny.i18n::Translator$new(translation_csvs_path = here::here("inst/translations")) +#' i18n$set_translation_language("en") +#' df_original <- mtcars +#' df_original[1,2:4] <- NA +#' df_obs <- df_original |> dplyr::filter(carb==4) +#' df_vars <- df_original[1:7] +#' val <- purrr::map2( +#' .x = validation_lib(), +#' .y = list( +#' list(x = df_original, y = df_obs), +#' list(x = df_original, y = df_vars), +#' list(x=df_original)), +#' make_validation +#' ) +#' val |> make_validation_alerts() +#' +#' val2 <- purrr::map2( +#' .x = validation_lib()[2], +#' .y = list(list(x = mtcars, y = mtcars[0])), +#' make_validation +#' ) +#' val2 |> make_validation_alerts() +#' +#' val3 <- make_validation( +#' ls = validation_lib()[[2]], +#' list(x = mtcars, y = mtcars[0]) +#' ) +make_validation <- function(ls, ...) { + ls <- do.call(ls, ...) + + df <- do.call(ls$summary.fun, ls$summary.fun.args) + + if (!any(dim(df) == c(0))) { + label <- with(df, { + glue::glue(ls$string) + }) + + # browser() + status <- do.call(ls$test.fun, modifyList(ls$test.fun.args, list(x = df))) + + data.frame( + label = label, + status = status[1] + ) + } else { + data.frame(NULL) + } +} + + +#' Create alert from validation data.frame +#' +#' @param data +#' +#' @export +make_validation_alerts <- function(data) { + # browser() + if (is.data.frame(data)){ + ls <- list(data) + } else { + ls <- data + } + + lapply( + X = ls, + FUN = function(x) { + # browser() + if (!is.null(dim(x)) && !any(dim(x) == c(0))) { + icon <- switch(x$status, + "succes" = phosphoricons::ph("check", title = "OK"), + "warning" = phosphoricons::ph("warning", title = "Warning") + ) + + shinyWidgets::alert( + icon, + htmltools::HTML(x$label), + status = x$status, + style = "margin-bottom: 10px; padding: 10px;" + ) + } else { + return(NULL) + } + } + ) +} ######## @@ -10536,6 +10976,7 @@ dark <- custom_theme( # https://webdesignerdepot.com/17-open-source-fonts-youll-actually-love/ ui <- bslib::page_fixed( + usei18n(i18n), ## Code formatting dependencies prismDependencies, prismRDependency, @@ -10565,7 +11006,8 @@ ui <- bslib::page_fixed( ui_elements("visuals"), ui_elements("analyze"), ui_elements("download"), - bslib::nav_spacer(), + # bslib::nav_spacer(), + # bslib::nav_panel(), # ui_elements$feedback, # ui_elements$docs, fillable = FALSE, @@ -10607,6 +11049,8 @@ load_data <- function() { # is_local = is.na(Sys.getenv('SHINY_SERVER_VERSION', NA)) + + server <- function(input, output, session) { ## Listing files in www in session start to keep when ending and removing ## everything else. @@ -10656,16 +11100,120 @@ server <- function(input, output, session) { code = list() ) + ############################################################################## + ######### + ######### Validation data + ######### + ############################################################################## + + rv_validations <- shiny::reactiveValues( + obs_filter = NULL, + vars_filter = NULL, + validations = NULL + ) + + ############################################################################## + ######### + ######### Internationalisation + ######### + ############################################################################## + + rv_alerts <- shiny::reactiveValues( + redcap_alert = NULL + ) + + # output$your_lang <- renderPrint(input$browser_lang) + + output$language_select <- shiny::renderUI({ + shiny::selectInput( + inputId = "language_select", + label = "", + selected = "en", + choices = language_choices(), + ) + }) + + observe({ + updateSelectInput( + session, + "language_select", + choices = language_choices(), + selected = input$browser_lang + ) + }) + + ## All updates on language change collected + shiny::observeEvent(input$language_select, { + ## Update language + update_lang(language = input$language_select, session) + # browser() + ## Update source selection + ## radioGroupButtons were used before introduction of translations, but does + ## not render correctly after. Saved for possible future solution + # updateRadioGroupButtons( + # session=session, + # inputId = "source", + # choices = setNames( + # c( + # "file", "redcap", "env" + # ), + # c( + # i18n$t("File upload"), + # i18n$t("REDCap server export"), + # i18n$t("Local or sample data") + # ) + # ), + # selected = "file" + # ) + shiny::updateSelectInput( + inputId = "source", + choices = setNames( + c( + "file", "redcap", "env" + ), + c( + i18n$t("File upload"), + i18n$t("REDCap server export"), + i18n$t("Local or sample data") + ) + ) + ) + + output$intro_text <- renderUI(includeHTML(i18n$t("www/intro.html"))) + }) + + output$redcap_warning <- shiny::renderUI({ + rv_alerts$redcap_alert + }) + ############################################################################## ######### ######### Data import section ######### ############################################################################## + shiny::observeEvent( + input$source, + { + ## Alert rendered on server as links do not render if only on client + if (input$source == "redcap") { + rv_alerts$redcap_alert <- shinyWidgets::alert( + id = "redcap_warning", + status = "info", + shiny::tags$h2(i18n$t("Please be mindfull handling sensitive data")), + shiny::markdown(i18n$t("The ***FreesearchR*** app only stores data for analyses, but please only use with sensitive data when running locally. [Read more here](https://agdamsbo.github.io/FreesearchR/#run-locally-on-your-own-machine).")), + # shiny::HTML(i18n$t("

The FreesearchR app only stores data for analyses, but please only use with sensitive data when running locally. Read more here

")), + dismissible = FALSE + ) + } + } + ) + data_file <- import_file_server( id = "file_import", show_data_in = "popup", trigger_return = "change", + file_extensions_text = sentence_paste(c(".csv", ".tsv", ".txt", ".xls", ".xlsx", ".rds", ".ods", ".dta"), i18n$t("or")), return_class = "data.frame" ) @@ -10964,18 +11512,79 @@ server <- function(input, output, session) { # rv$code$modify[[length(rv$code$modify) + 1]] <- attr(rv$data, "code") }) + shiny::observeEvent( + ## This could possibly be rewritten to include all validations + ## and rendering would just subset relevant or all + list( + rv$data, + rv$data_filtered, + rv$data_variables + ), + { + if (!is.null(rv$data_filtered)) { + rv_validations$obs_filter <- make_validation( + ls = validation_lib("obs_filter"), + list( + x = rv$data, + y = rv$data_filtered + ) + ) + } - # validation_server(id = "validation_col", - # data = purrr::map2( - # .x = validation_lib()[1], - # .y = list( - # list( - # x = - # reactive(rv$data), - # y = - # reactive(rv$data_variables) - # )), - # make_validation)) + if (!is.null(rv$data_variables)) { + rv_validations$var_filter <- make_validation( + ls = validation_lib("var_filter"), + list( + x = rv$data, + y = rv$data_variables + ) + ) + } + + if (!is.null(rv$data)) { + rv_validations$missings <- make_validation( + ls = validation_lib("missings"), + list( + x = rv$data + ) + ) + } + } + ) + + ## Validation alerts are rendered both individually and as a whole + ## Individually to display at point of interest + ## and as a whole to display on the final download panel + + shiny::observeEvent( + rv_validations$obs_filter, + { + validation_server( + id = "validation_obs", + data = rv_validations$obs_filter + ) + } + ) + + shiny::observeEvent( + rv_validations$var_filter, + { + validation_server( + id = "validation_var", + data = rv_validations$var_filter + ) + } + ) + + shiny::observeEvent( + rv_validations$var_filter, + { + validation_server( + id = "validation_all", + data = rv_validations + ) + } + ) ######### Data filter # IDEAFilter has the least cluttered UI, but might have a License issue diff --git a/inst/apps/FreesearchR/www/images/da.svg b/inst/apps/FreesearchR/www/images/da.svg new file mode 100755 index 0000000..5ab629b --- /dev/null +++ b/inst/apps/FreesearchR/www/images/da.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/inst/apps/FreesearchR/www/images/en.svg b/inst/apps/FreesearchR/www/images/en.svg new file mode 100755 index 0000000..21b97e9 --- /dev/null +++ b/inst/apps/FreesearchR/www/images/en.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/inst/apps/FreesearchR/www/images/sw.svg b/inst/apps/FreesearchR/www/images/sw.svg new file mode 100755 index 0000000..f9cfc45 --- /dev/null +++ b/inst/apps/FreesearchR/www/images/sw.svg @@ -0,0 +1 @@ + diff --git a/inst/apps/FreesearchR/www/intro.html b/inst/apps/FreesearchR/www/intro.html index f61794b..15f9f57 100644 --- a/inst/apps/FreesearchR/www/intro.html +++ b/inst/apps/FreesearchR/www/intro.html @@ -1,438 +1,33 @@ - - - - - - - - - - - - -intro - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - -
-

Welcome

-

This is the freesearcheR data analysis -tool. We intend the freesearcheR to be a -powerful and free tool for easy data evaluation and analysis at the -hands of the clinician.

-

By intention, this tool has been designed to be simple to use with a -minimum of mandatory options to keep the workflow streamlined, while -also including a few options to go even further.

-

There are some simple steps to go through (see corresponding tabs in -the top):

+

Welcome

+

This is the FreesearchR data analysis tool, +a free tool for basic data evaluation and analysis. If you need more +advanced tools, start with FreesearchR and +then you’ll probably be better off using R or similar +directly.

+

With this tool you can:

    -

  1. Import data (a spreadsheet/file on your machine, direct export -from a REDCap server, or a local file provided with a package) to get -started.

    2. -

  2. Inspec of data modification (change variable classes and creating -categorical variables (factors) from numeric or time data)

    3. -

  3. Data analysis of cross-sectionally designed studies (more study -designs are planned to be included)

    -
      -

    • Classic baseline charactieristics (options to stratify and -compare variables)

      • -

    • Linear, dichotomous or ordinal logistic regression will be used -depending on specified outcome variable

      • -

    • Evaluation of model assumptions

      • -
    4. -

  4. Export the the analyses results for MS Word or LibreOffice as well as the data -with preserved metadata.

    5. +

  5. Import data from a spreadsheet/file on your +machine, directly from a REDCap server, try +it with sample data or access data directly if run in R +locally

    6. +

  6. Prepare data for analysis by filtering data, +modifying variables or create new variables

    7. +

  7. Evaluate data using descriptive analyses methods +and inspect cross-correlations as well as missing observations

    8. +

  8. Visualise data by creating simple, clean plots for +overview and quick insights

    9. +

  9. Create simple regression models for even more +advanced data analyses

    10. +

  10. Download results as a report, get the modified +data set and save the code for learning and to reproduce the results +later

-

Have a look at the documentations page -for further project description. If you’re interested in the source -code, then go on, have a look!

-

If you encounter anything strange or the app doesn’t act as expected. -Please report -on Github.

+

The full project +documentation is here where you’ll find detailed descriptions of the +app and link to the source code! If you want to share feedback, +please follow this link to a simple survey.

- - - - -
- - - - - - - - - - - - - - - diff --git a/inst/apps/FreesearchR/www/intro.md b/inst/apps/FreesearchR/www/intro.md index da7c699..69bea66 100644 --- a/inst/apps/FreesearchR/www/intro.md +++ b/inst/apps/FreesearchR/www/intro.md @@ -1,3 +1,7 @@ +--- +output: html_fragment +--- + # Welcome This is the ***FreesearchR*** data analysis tool, a free tool for basic data evaluation and analysis. If you need more advanced tools, start with ***FreesearchR*** and then you'll probably be better off using *R* or similar directly. diff --git a/inst/apps/FreesearchR/www/intro_da.html b/inst/apps/FreesearchR/www/intro_da.html new file mode 100644 index 0000000..5df8d8b --- /dev/null +++ b/inst/apps/FreesearchR/www/intro_da.html @@ -0,0 +1,34 @@ + + + +
+

Velkommen +

+

Dette er FreesearchR-værktøjet, et gratis +værktøj til databehandling og -analyse. Har du brug for mere avancerede +værktøjer, så kan du starte FreesearchR og +senere selv hente R og RStudio eller lignende.

+

Herunder kan du helt kort se, hvad du kan bruge +FreesearchR til:

+
    +

  1. Import data from a spreadsheet/file on your +machine, directly from a REDCap server, try +it with sample data or access data directly if run in R +locally

    2. +

  2. Prepare data for analysis by filtering data, +modifying variables or create new variables

    3. +

  3. Evaluate data using descriptive analyses methods +and inspect cross-correlations as well as missing observations

    4. +

  4. Visualise data by creating simple, clean plots for +overview and quick insights

    5. +

  5. Create simple regression models for even more +advanced data analyses

    6. +

  6. Download results as a report, get the modified +data set and save the code for learning and to reproduce the results +later

    7. +
+

The full project +documentation is here where you’ll find detailed descriptions of the +app and link to the source code! If you want to share feedback, +please follow this link to a simple survey.

+
diff --git a/inst/apps/FreesearchR/www/intro_da.md b/inst/apps/FreesearchR/www/intro_da.md new file mode 100644 index 0000000..d7ccf59 --- /dev/null +++ b/inst/apps/FreesearchR/www/intro_da.md @@ -0,0 +1,23 @@ +--- +output: html_fragment +--- + +# Velkommen + +Dette er ***FreesearchR***-værktøjet, et gratis værktøj til databehandling og -analyse. Har du brug for mere avancerede værktøjer, så kan du starte ***FreesearchR*** og senere selv hente *R* og *RStudio* eller lignende. + +Herunder kan du helt kort se, hvad du kan bruge ***FreesearchR*** til: + +1. **Import data** from a spreadsheet/file on your machine, directly from a [REDCap](https://projectredcap.org/ "Read more on the data capture tool REDCap") server, try it with sample data or access data directly [if run in R locally](https://agdamsbo.github.io/FreesearchR//#run-locally-on-your-own-machine "Read about running FreesearchR on your local machine") + +2. **Prepare** data for analysis by filtering data, modifying variables or create new variables + +3. **Evaluate data** using descriptive analyses methods and inspect cross-correlations as well as [missing observations](https://agdamsbo.github.io/FreesearchR/articles/missingness.html "Read more about missing data") + +4. **Visualise data** by [creating simple, clean plots](https://agdamsbo.github.io/FreesearchR/articles/visuals.html "See available plot types") for overview and quick insights + +5. **Create simple regression models** for even more advanced data analyses + +6. **Download** results as a report, get the modified data set and save the code for learning and to reproduce the results later + +The full [project documentation is here](https://agdamsbo.github.io/FreesearchR/) where you'll find detailed descriptions of the app and link to the source code! If you want to [share feedback, please follow this link to a simple survey](https://redcap.au.dk/surveys/?s=JPCLPTXYDKFA8DA8). diff --git a/inst/apps/FreesearchR/www/intro_sw.html b/inst/apps/FreesearchR/www/intro_sw.html new file mode 100644 index 0000000..39ee4dc --- /dev/null +++ b/inst/apps/FreesearchR/www/intro_sw.html @@ -0,0 +1,33 @@ + + + +
+

Karibu

+

This is the FreesearchR data analysis tool, +a free tool for basic data evaluation and analysis. If you need more +advanced tools, start with FreesearchR and +then you’ll probably be better off using R or similar +directly.

+

With this tool you can:

+
    +

  1. Import data from a spreadsheet/file on your +machine, directly from a REDCap server, try +it with sample data or access data directly if run in R +locally

    2. +

  2. Prepare data for analysis by filtering data, +modifying variables or create new variables

    3. +

  3. Evaluate data using descriptive analyses methods +and inspect cross-correlations as well as missing observations

    4. +

  4. Visualise data by creating simple, clean plots for +overview and quick insights

    5. +

  5. Create simple regression models for even more +advanced data analyses

    6. +

  6. Download results as a report, get the modified +data set and save the code for learning and to reproduce the results +later

    7. +
+

The full project +documentation is here where you’ll find detailed descriptions of the +app and link to the source code! If you want to share feedback, +please follow this link to a simple survey.

+
diff --git a/inst/apps/FreesearchR/www/intro_sw.md b/inst/apps/FreesearchR/www/intro_sw.md new file mode 100644 index 0000000..37c7f09 --- /dev/null +++ b/inst/apps/FreesearchR/www/intro_sw.md @@ -0,0 +1,23 @@ +--- +output: html_fragment +--- + +# Karibu + +This is the ***FreesearchR*** data analysis tool, a free tool for basic data evaluation and analysis. If you need more advanced tools, start with ***FreesearchR*** and then you'll probably be better off using *R* or similar directly. + +With this tool you can: + +1. **Import data** from a spreadsheet/file on your machine, directly from a [REDCap](https://projectredcap.org/ "Read more on the data capture tool REDCap") server, try it with sample data or access data directly [if run in R locally](https://agdamsbo.github.io/FreesearchR//#run-locally-on-your-own-machine "Read about running FreesearchR on your local machine") + +2. **Prepare** data for analysis by filtering data, modifying variables or create new variables + +3. **Evaluate data** using descriptive analyses methods and inspect cross-correlations as well as [missing observations](https://agdamsbo.github.io/FreesearchR/articles/missingness.html "Read more about missing data") + +4. **Visualise data** by [creating simple, clean plots](https://agdamsbo.github.io/FreesearchR/articles/visuals.html "See available plot types") for overview and quick insights + +5. **Create simple regression models** for even more advanced data analyses + +6. **Download** results as a report, get the modified data set and save the code for learning and to reproduce the results later + +The full [project documentation is here](https://agdamsbo.github.io/FreesearchR/) where you'll find detailed descriptions of the app and link to the source code! If you want to [share feedback, please follow this link to a simple survey](https://redcap.au.dk/surveys/?s=JPCLPTXYDKFA8DA8). diff --git a/inst/apps/FreesearchR/www/scripts.js b/inst/apps/FreesearchR/www/scripts.js index f98dffc..6720947 100644 --- a/inst/apps/FreesearchR/www/scripts.js +++ b/inst/apps/FreesearchR/www/scripts.js @@ -1,5 +1,13 @@ // Automatically close drop-downs on navigation // Thanks to claude.ai +$(document).ready(function() { + var language = window.navigator.userLanguage || window.navigator.language; + var iso639Language = language.split('-')[0]; + Shiny.onInputChange('browser_lang', iso639Language); + console.log('Browser language:',iso639Language); +}); + + $(document).on('shown.bs.tab', '#main_panel', function(e) { // Close dropdown in this specific navset only $('#main_panel .dropdown-menu').removeClass('show'); @@ -8,6 +16,12 @@ $(document).on('shown.bs.tab', '#main_panel', function(e) { $(document).on('shiny:sessioninitialized', function() { + // Function to get browser language + // var language = window.navigator.userLanguage || window.navigator.language; + // var iso639Language = language.split('-')[0]; + // Shiny.onInputChange('browser_lang', iso639Language); + // console.log('Browser language:',iso639Language); + // Function to collapse navbar on mobile function collapseNavbar() { var navbar = $('.navbar-collapse'); @@ -54,4 +68,7 @@ $(document).on('shiny:sessioninitialized', function() { collapseNavbar(); } }); + + }); + diff --git a/inst/apps/FreesearchR/www/style.css b/inst/apps/FreesearchR/www/style.css index fedcd1f..ce38e39 100644 --- a/inst/apps/FreesearchR/www/style.css +++ b/inst/apps/FreesearchR/www/style.css @@ -123,3 +123,5 @@ background-color: #2E2E2E; color: #FFFFFF; } + + diff --git a/inst/assets/css/FreesearchR.css b/inst/assets/css/FreesearchR.css index fedcd1f..ce38e39 100644 --- a/inst/assets/css/FreesearchR.css +++ b/inst/assets/css/FreesearchR.css @@ -123,3 +123,5 @@ background-color: #2E2E2E; color: #FFFFFF; } + + diff --git a/inst/assets/js/FreesearchR.js b/inst/assets/js/FreesearchR.js index f98dffc..6720947 100644 --- a/inst/assets/js/FreesearchR.js +++ b/inst/assets/js/FreesearchR.js @@ -1,5 +1,13 @@ // Automatically close drop-downs on navigation // Thanks to claude.ai +$(document).ready(function() { + var language = window.navigator.userLanguage || window.navigator.language; + var iso639Language = language.split('-')[0]; + Shiny.onInputChange('browser_lang', iso639Language); + console.log('Browser language:',iso639Language); +}); + + $(document).on('shown.bs.tab', '#main_panel', function(e) { // Close dropdown in this specific navset only $('#main_panel .dropdown-menu').removeClass('show'); @@ -8,6 +16,12 @@ $(document).on('shown.bs.tab', '#main_panel', function(e) { $(document).on('shiny:sessioninitialized', function() { + // Function to get browser language + // var language = window.navigator.userLanguage || window.navigator.language; + // var iso639Language = language.split('-')[0]; + // Shiny.onInputChange('browser_lang', iso639Language); + // console.log('Browser language:',iso639Language); + // Function to collapse navbar on mobile function collapseNavbar() { var navbar = $('.navbar-collapse'); @@ -54,4 +68,7 @@ $(document).on('shiny:sessioninitialized', function() { collapseNavbar(); } }); + + }); + diff --git a/inst/translations/translation_da.csv b/inst/translations/translation_da.csv new file mode 100644 index 0000000..f6b7d78 --- /dev/null +++ b/inst/translations/translation_da.csv @@ -0,0 +1,106 @@ +"en","da" +"Hello","Hej" +"Get started","Kom i gang" +"File upload","Upload fil" +"REDCap server export","REDCap server export" +"Local or sample data","Lokal eller testdata" +"Please be mindfull handling sensitive data","Please be mindfull handling sensitive data" +"The ***FreesearchR*** app only stores data for analyses, but please only use with sensitive data when running locally. [Read more here](https://agdamsbo.github.io/FreesearchR/#run-locally-on-your-own-machine).","The ***FreesearchR*** app only stores data for analyses, but please only use with sensitive data when running locally. [Read more here](https://agdamsbo.github.io/FreesearchR/#run-locally-on-your-own-machine)." +"Quick overview","Quick overview" +"Select variables for final import","Select variables for final import" +"Exclude incomplete variables:","Exclude incomplete variables:" +"Manual selection:","Manual selection:" +"Let's begin!","Let's begin!" +"Analysis validation","Analysis validation" +"Report","Rapport" +"Choose your favourite output file format for further work, and download, when the analyses are done.","Choose your favourite output file format for further work, and download, when the analyses are done." +"www/intro.html","www/intro_da.html" +"

The FreesearchR app only stores data for analyses, but please only use with sensitive data when running locally. Read more here

","

The FreesearchR app only stores data for analyses, but please only use with sensitive data when running locally. Read more here

" +"Overview and filter","Overview and filter" +"Overview and filtering","Overview and filtering" +"Below you find a summary table for quick insigths, and on the right you can visualise data classes, browse data and apply different data filters.","Below you find a summary table for quick insigths, and on the right you can visualise data classes, browse data and apply different data filters." +"Visual overview","Visual overview" +"Browse data","Browse data" +"Filter data types","Filter data types" +"Filter observations","Filter observations" +"Apply filter on observation","Apply filter on observation" +"Edit and create data","Edit and create data" +"Subset, rename and convert variables","Subset, rename and convert variables" +"Below, are several options for simple data manipulation like update variables by renaming, creating new labels (for nicer tables in the report) and changing variable classes (numeric, factor/categorical etc.).","Below, are several options for simple data manipulation like update variables by renaming, creating new labels (for nicer tables in the report) and changing variable classes (numeric, factor/categorical etc.)." +"There are more advanced options to modify factor/categorical variables as well as create new factor from a continous variable or new variables with R code. At the bottom you can restore the original data.","There are more advanced options to modify factor/categorical variables as well as create new factor from a continous variable or new variables with R code. At the bottom you can restore the original data." +"Please note that data modifications are applied before any filtering.","Please note that data modifications are applied before any filtering." +"Advanced data manipulation","Advanced data manipulation" +"Below options allow more advanced varaible manipulations.","Below options allow more advanced varaible manipulations." +"Reorder factor levels","Reorder factor levels" +"Reorder the levels of factor/categorical variables.","Reorder the levels of factor/categorical variables." +"New factor","New factor" +"Create factor/categorical variable from a continous variable (number/date/time).","Create factor/categorical variable from a continous variable (number/date/time)." +"New variable","New variable" +"Create a new variable based on an R-expression.","Create a new variable based on an R-expression." +"Compare modified data to original","Compare modified data to original" +"Raw print of the original vs the modified data.","Raw print of the original vs the modified data." +"Original data:","Original data:" +"Modified data:","Modified data:" +"New column name:","New column name:" +"Group calculation by:","Group calculation by:" +"Enter an expression to define new column:","Enter an expression to define new column:" +"Click on a column name to add it to the expression:","Click on a column name to add it to the expression:" +"Create column","Create column" +"Choose a name for the column to be created or modified,","Choose a name for the column to be created or modified," +"then enter an expression before clicking on the button above to validate or on","then enter an expression before clicking on the button above to validate or on" +"to delete it.","to delete it." +"New column name cannot be empty","New column name cannot be empty" +"Create a new column","Create a new column" +"Some operations are not allowed","Some operations are not allowed" +"Column added!","Column added!" +"Unique values:","Unique values:" +"Variable to cut:","Variable to cut:" +"Number of breaks:","Number of breaks:" +"Close intervals on the right","Close intervals on the right" +"Include lowest value","Include lowest value" +"Create factor variable","Create factor variable" +"Fixed breaks:","Fixed breaks:" +"Method:","Method:" +"Convert Numeric to Factor","Convert Numeric to Factor" +"Unique:","Unique:" +"Missing:","Missing:" +"Most Common:","Most Common:" +"Min:","Min:" +"Mean:","Mean:" +"Max:","Max:" +"Decimal separator:","Decimal separator:" +"First five rows are shown below:","First five rows are shown below:" +"Imported data","Imported data" +"www/intro.md","www/intro.md" +"Choose your data","Choose your data" +"Upload a file, get data directly from REDCap or use local or sample data.","Upload a file, get data directly from REDCap or use local or sample data." +"Factor variable to reorder:","Factor variable to reorder:" +"Sort by levels","Sort by levels" +"Sort by count","Sort by count" +"Create a new variable (otherwise replaces the one selected)","Create a new variable (otherwise replaces the one selected)" +"Update factor variable","Updater faktor-variabel" +"Sort count","Sorter antal" +"Levels","Niveauer" +"Count","Antal" +"Update levels of a factor","Updater niveauerne for en faktor" +"Update & select variables","Update & select variables" +"Date format:","Date format:" +"Date to use as origin to convert date/datetime:","Date to use as origin to convert date/datetime:" +"Apply changes","Apply changes" +"Data has %s observations and %s variables.","Data has %s observations and %s variables." +"No data to display.","No data to display." +"Data successfully updated!","Data successfully updated!" +"Only include variables missing less observations than the specified percentage. At 0, only complete variables are included; at 100, all variables are included.","Only include variables missing less observations than the specified percentage. At 0, only complete variables are included; at 100, all variables are included." +"or","eller" +"You removed {p_out} % of observations.","Du har fjernet {p_out} % af observationerne." +"You removed {p_out} % of variables.","Du har fjernet {p_out} % af variablerne." +"You can import {file_extensions_text} files","Du kan vælge mellem disse filtyper: {file_extensions_text}." +"You can choose between these file types:","Du kan vælge mellem følgene filtyper:" +"Rows to skip before reading data:","Rows to skip before reading data:" +"Missing values character(s):","Missing values character(s):" +"if several use a comma (',') to separate them","if several use a comma (',') to separate them" +"Encoding:","Encoding:" +"Upload a file:","Upload a file:" +"Browse...","Browse..." +"Select sheet to import:","Select sheet to import:" +"No file selected.","No file selected." diff --git a/inst/translations/translation_sw.csv b/inst/translations/translation_sw.csv new file mode 100644 index 0000000..3851b5b --- /dev/null +++ b/inst/translations/translation_sw.csv @@ -0,0 +1,106 @@ +"en","sw" +"Hello","Habari" +"Get started","Get started" +"File upload","File upload" +"REDCap server export","REDCap server export" +"Local or sample data","Local or sample data" +"Please be mindfull handling sensitive data","Please be mindfull handling sensitive data" +"The ***FreesearchR*** app only stores data for analyses, but please only use with sensitive data when running locally. [Read more here](https://agdamsbo.github.io/FreesearchR/#run-locally-on-your-own-machine).","The ***FreesearchR*** app only stores data for analyses, but please only use with sensitive data when running locally. [Read more here](https://agdamsbo.github.io/FreesearchR/#run-locally-on-your-own-machine)." +"Quick overview","Quick overview" +"Select variables for final import","Select variables for final import" +"Exclude incomplete variables:","Exclude incomplete variables:" +"Manual selection:","Manual selection:" +"Let's begin!","Let's begin!" +"Analysis validation","Analysis validation" +"Report","Report" +"Choose your favourite output file format for further work, and download, when the analyses are done.","Choose your favourite output file format for further work, and download, when the analyses are done." +"www/intro.html","www/intro_sw.html" +"

The FreesearchR app only stores data for analyses, but please only use with sensitive data when running locally. Read more here

","

The FreesearchR app only stores data for analyses, but please only use with sensitive data when running locally. Read more here

" +"Overview and filter","Overview and filter" +"Overview and filtering","Overview and filtering" +"Below you find a summary table for quick insigths, and on the right you can visualise data classes, browse data and apply different data filters.","Below you find a summary table for quick insigths, and on the right you can visualise data classes, browse data and apply different data filters." +"Visual overview","Visual overview" +"Browse data","Browse data" +"Filter data types","Filter data types" +"Filter observations","Filter observations" +"Apply filter on observation","Apply filter on observation" +"Edit and create data","Edit and create data" +"Subset, rename and convert variables","Subset, rename and convert variables" +"Below, are several options for simple data manipulation like update variables by renaming, creating new labels (for nicer tables in the report) and changing variable classes (numeric, factor/categorical etc.).","Below, are several options for simple data manipulation like update variables by renaming, creating new labels (for nicer tables in the report) and changing variable classes (numeric, factor/categorical etc.)." +"There are more advanced options to modify factor/categorical variables as well as create new factor from a continous variable or new variables with R code. At the bottom you can restore the original data.","There are more advanced options to modify factor/categorical variables as well as create new factor from a continous variable or new variables with R code. At the bottom you can restore the original data." +"Please note that data modifications are applied before any filtering.","Please note that data modifications are applied before any filtering." +"Advanced data manipulation","Advanced data manipulation" +"Below options allow more advanced varaible manipulations.","Below options allow more advanced varaible manipulations." +"Reorder factor levels","Reorder factor levels" +"Reorder the levels of factor/categorical variables.","Reorder the levels of factor/categorical variables." +"New factor","New factor" +"Create factor/categorical variable from a continous variable (number/date/time).","Create factor/categorical variable from a continous variable (number/date/time)." +"New variable","New variable" +"Create a new variable based on an R-expression.","Create a new variable based on an R-expression." +"Compare modified data to original","Compare modified data to original" +"Raw print of the original vs the modified data.","Raw print of the original vs the modified data." +"Original data:","Original data:" +"Modified data:","Modified data:" +"New column name:","New column name:" +"Group calculation by:","Group calculation by:" +"Enter an expression to define new column:","Enter an expression to define new column:" +"Click on a column name to add it to the expression:","Click on a column name to add it to the expression:" +"Create column","Create column" +"Choose a name for the column to be created or modified,","Choose a name for the column to be created or modified," +"then enter an expression before clicking on the button above to validate or on","then enter an expression before clicking on the button above to validate or on" +"to delete it.","to delete it." +"New column name cannot be empty","New column name cannot be empty" +"Create a new column","Create a new column" +"Some operations are not allowed","Some operations are not allowed" +"Column added!","Column added!" +"Unique values:","Unique values:" +"Variable to cut:","Variable to cut:" +"Number of breaks:","Number of breaks:" +"Close intervals on the right","Close intervals on the right" +"Include lowest value","Include lowest value" +"Create factor variable","Create factor variable" +"Fixed breaks:","Fixed breaks:" +"Method:","Method:" +"Convert Numeric to Factor","Convert Numeric to Factor" +"Unique:","Unique:" +"Missing:","Missing:" +"Most Common:","Most Common:" +"Min:","Min:" +"Mean:","Mean:" +"Max:","Max:" +"Decimal separator:","Decimal separator:" +"First five rows are shown below:","First five rows are shown below:" +"Imported data","Imported data" +"www/intro.md","www/intro.md" +"Choose your data","Choose your data" +"Upload a file, get data directly from REDCap or use local or sample data.","Upload a file, get data directly from REDCap or use local or sample data." +"Factor variable to reorder:","Factor variable to reorder:" +"Sort by levels","Sort by levels" +"Sort by count","Sort by count" +"Create a new variable (otherwise replaces the one selected)","Create a new variable (otherwise replaces the one selected)" +"Update factor variable","Update factor variable" +"Sort count","Sort count" +"Levels","Levels" +"Count","Count" +"Update levels of a factor","Update levels of a factor" +"Update & select variables","Update & select variables" +"Date format:","Date format:" +"Date to use as origin to convert date/datetime:","Date to use as origin to convert date/datetime:" +"Apply changes","Apply changes" +"Data has %s observations and %s variables.","Data has %s observations and %s variables." +"No data to display.","No data to display." +"Data successfully updated!","Data successfully updated!" +"Only include variables missing less observations than the specified percentage. At 0, only complete variables are included; at 100, all variables are included.","Only include variables missing less observations than the specified percentage. At 0, only complete variables are included; at 100, all variables are included." +"You removed {p_out} % of observations.","You removed {p_out} % of observations." +"You removed {p_out} % of variables.","You removed {p_out} % of variables." +"or","or" +"You can import {file_extensions_text} files","You can import {file_extensions_text} files" +"You can choose between these file types:","You can choose between these file types:" +"Rows to skip before reading data:","Rows to skip before reading data:" +"Missing values character(s):","Missing values character(s):" +"if several use a comma (',') to separate them","if several use a comma (',') to separate them" +"Encoding:","Encoding:" +"Upload a file:","Upload a file:" +"Browse...","Browse..." +"Select sheet to import:","Select sheet to import:" +"No file selected.","No file selected." diff --git a/man/create-column.Rd b/man/create-column.Rd index 45a0e0f..e522d9d 100644 --- a/man/create-column.Rd +++ b/man/create-column.Rd @@ -21,7 +21,7 @@ list_allowed_operations() modal_create_column( id, - title = i18n("Create a new column"), + title = i18n$t("Create a new column"), easyClose = TRUE, size = "l", footer = NULL @@ -29,7 +29,7 @@ modal_create_column( winbox_create_column( id, - title = i18n("Create a new column"), + title = i18n$t("Create a new column"), options = shinyWidgets::wbOptions(), controls = shinyWidgets::wbControls() ) diff --git a/man/cut-variable.Rd b/man/cut-variable.Rd index 67a125c..3b58888 100644 --- a/man/cut-variable.Rd +++ b/man/cut-variable.Rd @@ -13,7 +13,7 @@ cut_variable_server(id, data_r = reactive(NULL)) modal_cut_variable( id, - title = datamods:::i18n("Convert Numeric to Factor"), + title = i18n$t("Convert Numeric to Factor"), easyClose = TRUE, size = "l", footer = NULL diff --git a/man/dim_change_call.Rd b/man/dim_change_call.Rd new file mode 100644 index 0000000..1c3b062 --- /dev/null +++ b/man/dim_change_call.Rd @@ -0,0 +1,21 @@ +% Generated by roxygen2: do not edit by hand +% Please edit documentation in R/validation.R +\name{dim_change_call} +\alias{dim_change_call} +\title{Dimensions validation} +\usage{ +dim_change_call(before, after, fun) +} +\arguments{ +\item{before}{data before} + +\item{after}{data after} + +\item{fun}{dimension function. ncol or nrow} +} +\value{ +data.frame +} +\description{ +Dimensions validation +} diff --git a/man/import-file.Rd b/man/import-file.Rd index 233800e..59444b0 100644 --- a/man/import-file.Rd +++ b/man/import-file.Rd @@ -20,6 +20,8 @@ import_file_server( btn_show_data = TRUE, show_data_in = c("popup", "modal"), trigger_return = c("button", "change"), + file_extensions_text = paste(c(".csv", ".txt", ".xls", ".xlsx", ".rds", ".fst", + ".sas7bdat", ".sav"), collapse = ", "), return_class = c("data.frame", "data.table", "tbl_df", "raw"), reset = reactive(NULL) ) diff --git a/man/make_validation.Rd b/man/make_validation.Rd new file mode 100644 index 0000000..a60f136 --- /dev/null +++ b/man/make_validation.Rd @@ -0,0 +1,48 @@ +% Generated by roxygen2: do not edit by hand +% Please edit documentation in R/validation.R +\name{make_validation} +\alias{make_validation} +\title{Create validation data.frame} +\usage{ +make_validation(ls, ...) +} +\arguments{ +\item{ls}{validation list} + +\item{...}{magic dots} +} +\value{ +data.frame +} +\description{ +Create validation data.frame +} +\examples{ +i18n <- shiny.i18n::Translator$new(translation_csvs_path = here::here("inst/translations")) +i18n$set_translation_language("en") +df_original <- mtcars +df_original[1,2:4] <- NA +df_obs <- df_original |> dplyr::filter(carb==4) +df_vars <- df_original[1:7] +val <- purrr::map2( + .x = validation_lib(), + .y = list( + list(x = df_original, y = df_obs), + list(x = df_original, y = df_vars), + list(x=df_original)), + make_validation +) +val |> make_validation_alerts() + +val2 <- purrr::map2( + .x = validation_lib()[2], + .y = list(list(x = mtcars, y = mtcars[0])), + make_validation +) +val2 |> make_validation_alerts() + +val3 <- make_validation( + ls = validation_lib()[[2]], + list(x = mtcars, y = mtcars[0]) +) +} diff --git a/man/make_validation_alerts.Rd b/man/make_validation_alerts.Rd new file mode 100644 index 0000000..481e26a --- /dev/null +++ b/man/make_validation_alerts.Rd @@ -0,0 +1,14 @@ +% Generated by roxygen2: do not edit by hand +% Please edit documentation in R/validation.R +\name{make_validation_alerts} +\alias{make_validation_alerts} +\title{Create alert from validation data.frame} +\usage{ +make_validation_alerts(data) +} +\arguments{ +\item{data}{} +} +\description{ +Create alert from validation data.frame +} diff --git a/man/missings_validate.Rd b/man/missings_validate.Rd new file mode 100644 index 0000000..1638383 --- /dev/null +++ b/man/missings_validate.Rd @@ -0,0 +1,22 @@ +% Generated by roxygen2: do not edit by hand +% Please edit documentation in R/validation.R +\name{missings_validate} +\alias{missings_validate} +\title{Validate function of missingness in data} +\usage{ +missings_validate(data) +} +\arguments{ +\item{data}{data set} +} +\value{ +data.frame +} +\description{ +Validate function of missingness in data +} +\examples{ +df <- mtcars +df[1,2:4] <- NA +missings_validate(df) +} diff --git a/man/obs_filter_validate.Rd b/man/obs_filter_validate.Rd new file mode 100644 index 0000000..2fd7c57 --- /dev/null +++ b/man/obs_filter_validate.Rd @@ -0,0 +1,19 @@ +% Generated by roxygen2: do not edit by hand +% Please edit documentation in R/validation.R +\name{obs_filter_validate} +\alias{obs_filter_validate} +\title{Observations filter test wrapper} +\usage{ +obs_filter_validate(before, after) +} +\arguments{ +\item{before}{data before} + +\item{after}{data after} +} +\value{ +vector +} +\description{ +Observations filter test wrapper +} diff --git a/man/update-factor.Rd b/man/update-factor.Rd index c5810be..23e4bab 100644 --- a/man/update-factor.Rd +++ b/man/update-factor.Rd @@ -14,7 +14,7 @@ update_factor_server(id, data_r = reactive(NULL)) modal_update_factor( id, - title = i18n("Update levels of a factor"), + title = i18n$t("Update levels of a factor"), easyClose = TRUE, size = "l", footer = NULL @@ -22,7 +22,7 @@ modal_update_factor( winbox_update_factor( id, - title = i18n("Update levels of a factor"), + title = i18n$t("Update levels of a factor"), options = shinyWidgets::wbOptions(), controls = shinyWidgets::wbControls() ) diff --git a/renv.lock b/renv.lock index 0735cef..fb494ff 100644 --- a/renv.lock +++ b/renv.lock @@ -8060,6 +8060,50 @@ "Maintainer": "Winston Chang ", "Repository": "CRAN" }, + "shiny.i18n": { + "Package": "shiny.i18n", + "Version": "0.3.0", + "Source": "Repository", + "Title": "Shiny Applications Internationalization", + "Authors@R": "c( person(\"Jakub\", \"Nowicki\", email = \"opensource+kuba@appsilon.com\", role = c(\"cre\", \"aut\")), person(\"Dominik\", \"Krzemiński\", email = \"raymon92@gmail.com\", role = c(\"aut\")), person(\"Krystian\", \"Igras\", email = \"krystian8207@gmail.com\", role = c(\"aut\")), person(\"Jakub\", \"Sobolewski\", email = \"jakub.sobolewski@appsilon.com\", role = c(\"aut\")), person(\"Appsilon Sp. z o.o.\", role = \"cph\", email = \"opensource@appsilon.com\") )", + "Description": "It provides easy internationalization of Shiny applications. It can be used as standalone translation package to translate reports, interactive visualizations or graphical elements as well.", + "Depends": [ + "R (>= 3.3.0)" + ], + "Imports": [ + "yaml", + "jsonlite", + "methods", + "stringr", + "R6", + "glue", + "shiny", + "rstudioapi", + "utils" + ], + "License": "MIT + file LICENSE", + "Encoding": "UTF-8", + "URL": "https://appsilon.github.io/shiny.i18n/, https://github.com/Appsilon/shiny.i18n", + "BugReports": "https://github.com/Appsilon/shiny.i18n/issues", + "RoxygenNote": "7.2.1", + "Suggests": [ + "covr", + "googleLanguageR", + "knitr", + "lintr", + "rcmdcheck", + "rmarkdown", + "spelling", + "testthat", + "withr", + "quarto" + ], + "Language": "en-US", + "NeedsCompilation": "no", + "Author": "Jakub Nowicki [cre, aut], Dominik Krzemiński [aut], Krystian Igras [aut], Jakub Sobolewski [aut], Appsilon Sp. z o.o. [cph]", + "Maintainer": "Jakub Nowicki ", + "Repository": "CRAN" + }, "shinyTime": { "Package": "shinyTime", "Version": "1.0.3",