diff --git a/R/import-file-ext.R b/R/import-file-ext.R index a8e0955..e0f00b6 100644 --- a/R/import-file-ext.R +++ b/R/import-file-ext.R @@ -176,7 +176,6 @@ 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( diff --git a/R/sysdata.rda b/R/sysdata.rda index 31a330e..041f8a6 100644 Binary files a/R/sysdata.rda and b/R/sysdata.rda differ diff --git a/SESSION.md b/SESSION.md index fc62f43..64ac790 100644 --- a/SESSION.md +++ b/SESSION.md @@ -43,6 +43,7 @@ |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) | @@ -52,6 +53,7 @@ |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) | +|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) | @@ -110,6 +112,7 @@ |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) | @@ -162,6 +165,7 @@ |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) | @@ -214,7 +218,9 @@ |tzdb |0.5.0 |2025-03-15 |CRAN (R 4.4.1) | |urlchecker |1.0.1 |2021-11-30 |CRAN (R 4.4.1) | |usethis |3.1.0 |2024-11-26 |CRAN (R 4.4.1) | +|utf8 |1.2.6 |2025-06-08 |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) | diff --git a/inst/apps/FreesearchR/app.R b/inst/apps/FreesearchR/app.R index 8b34cef..a669b1c 100644 --- a/inst/apps/FreesearchR/app.R +++ b/inst/apps/FreesearchR/app.R @@ -1,5 +1,12 @@ +######## +#### Current file: /Users/au301842/FreesearchR/app/global_vars.R +######## + +trans_path <- here::here("inst/translations") + + ######## #### Current file: /Users/au301842/FreesearchR/app/libs.R ######## @@ -40,7 +47,7 @@ library(rlang) library(shiny.i18n) ## Translation init -i18n <- shiny.i18n::Translator$new(translation_csvs_path = here::here("inst/translations")) +i18n <- shiny.i18n::Translator$new(translation_csvs_path = trans_path) i18n$set_translation_language("en") @@ -4253,7 +4260,6 @@ 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( @@ -11213,7 +11219,6 @@ server <- function(input, output, session) { 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" ) @@ -11518,7 +11523,8 @@ server <- function(input, output, session) { list( rv$data, rv$data_filtered, - rv$data_variables + rv$data_variables, + input$language_select ), { if (!is.null(rv$data_filtered)) { diff --git a/inst/translations/translation_da.csv b/inst/translations/translation_da.csv index f6b7d78..9d1d961 100644 --- a/inst/translations/translation_da.csv +++ b/inst/translations/translation_da.csv @@ -91,7 +91,6 @@ "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}." diff --git a/inst/translations/translation_sw.csv b/inst/translations/translation_sw.csv index 3851b5b..178630e 100644 --- a/inst/translations/translation_sw.csv +++ b/inst/translations/translation_sw.csv @@ -93,7 +93,6 @@ "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:" diff --git a/man/import-file.Rd b/man/import-file.Rd index 59444b0..233800e 100644 --- a/man/import-file.Rd +++ b/man/import-file.Rd @@ -20,8 +20,6 @@ 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) )