Accelerated translation lookup with fastmap

jamovi · Nov 15, 2021 · c280f11 · c280f11
1 parent 04f4deb
commit c280f11
Show file tree

Hide file tree

Showing 3 changed files with 43 additions and 25 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -25,5 +25,6 @@ Suggests:
     knitr,
     ggplot2,
     RColorBrewer,
-    ragg
+    ragg,
+    fastmap
 RoxygenNote: 6.1.1
diff --git a/R/analysis.R b/R/analysis.R
@@ -21,7 +21,6 @@ Analysis <- R6::R6Class('Analysis',
         .analysisId='',
         .name='',
         .package='',
-        .language='',
         .title='',
         .options=NA,
         .results=NA,
@@ -47,7 +46,6 @@ Analysis <- R6::R6Class('Analysis',
         .parent=NA,
         .addons=NA,
         .stacktrace='',
-        .translator=NA,
         .checkpoint=function(flush=TRUE) {
             if (is.null(private$.checkpointCB))
                 return()
@@ -128,7 +126,6 @@ Analysis <- R6::R6Class('Analysis',
             version,
             options,
             results,
-            language='en',
             pause=NULL,
             data=NULL,
             datasetId='',
@@ -140,7 +137,6 @@ Analysis <- R6::R6Class('Analysis',
 
             private$.package <- package
             private$.name    <- name
-            private$.language <- language
             private$.version <- version
             private$.options <- options
             private$.results <- results
@@ -152,8 +148,6 @@ Analysis <- R6::R6Class('Analysis',
             private$.completeWhenFilled <- completeWhenFilled
             private$.requiresMissings <- requiresMissings
 
-            private$.translator <- createTranslator(package, language)
-
             private$.results$.setParent(self)
             private$.options$analysis <- self
 
@@ -163,7 +157,7 @@ Analysis <- R6::R6Class('Analysis',
             private$.addons <- list()
         },
         translate=function(text, n=1) {
-            private$.translator$translate(text, n)
+            private$.options$translate(text, n)
         },
         check=function(checkValues=FALSE, checkVars=FALSE, checkData=FALSE) {
             private$.options$check(

diff --git a/R/i18n.R b/R/i18n.R
@@ -11,25 +11,48 @@ Translator <- R6Class('Translator',
     private=list(
         .table=NA
     ),
-    public=list(
-        initialize=function(langDef) {
-            if (length(langDef) == 0) {
-                private$.table <- list()
-            } else {
-                private$.table <- langDef$locale_data$messages
+    public=`if`(requireNamespace('fastmap'),
+        list(
+            initialize=function(langDef) {
+                private$.table <- fastmap::fastmap()
+                if (length(langDef) > 0) {
+                    messages <- langDef$locale_data$messages
+                    messages <- messages[names(messages) != ""]
+                    private$.table$mset(.list=messages)
+                }
+            },
+            translate=function(text, n=1) {
+                if (is.null(text) || text == '')
+                    return(text)
+                result <- private$.table$get(text)
+                if ( ! is.null(result)) {
+                    result <- result[[1]]
+                    if (result != '')
+                        text <- result
+                }
+                text
             }
-        },
-        translate=function(text, n=1) {
-            if (is.null(text))
-                return(text)
-            result <- private$.table[[text]]
-            if ( ! is.null(result)) {
-                result <- result[[1]]
-                if (result != '')
-                    text <- result
+        ),
+        list(
+            initialize=function(langDef) {
+                if (length(langDef) == 0) {
+                    private$.table <- list()
+                } else {
+                    private$.table <- langDef$locale_data$messages
+                }
+            },
+            translate=function(text, n=1) {
+                if (is.null(text) || text == '')
+                    return(text)
+                result <- private$.table[[text]]
+                if ( ! is.null(result)) {
+                    result <- result[[1]]
+                    if (result != '')
+                        text <- result
+                }
+                text
             }
-            text
-        }
+        )
     )
 )