Merge pull request #85 from africanmathsinitiative/master

updating master
lilyclements · Aug 29, 2022 · dc30615 · dc30615
2 parents de184ec + f90f99c
commit dc30615
Show file tree

Hide file tree

Showing 18 changed files with 1,791 additions and 1,376 deletions.
diff --git a/instat/clsInstatOptions.vb b/instat/clsInstatOptions.vb
@@ -72,7 +72,7 @@ Imports RDotNet
         iPreviewRows = clsInstatOptionsDefaults.DEFAULTiPreviewRows
         iMaxRows = clsInstatOptionsDefaults.DEFAULTiMaxRows
         iMaxCols = clsInstatOptionsDefaults.DEFAULTiMaxCols
-        strComment = clsInstatOptionsDefaults.DEFAULTstrComment
+        strComment = Translations.GetTranslation(clsInstatOptionsDefaults.DEFAULTstrComment)
         strGraphDisplayOption = clsInstatOptionsDefaults.DEFAULTstrGraphDisplayOption
         strLanguageCultureCode = clsInstatOptionsDefaults.DEFAULTstrLanguageCultureCode
         strWorkingDirectory = clsInstatOptionsDefaults.DEFAULTstrWorkingDirectory
@@ -143,10 +143,8 @@ Imports RDotNet
             SetCommandInOutpt(clsInstatOptionsDefaults.DEFAULTbCommandsinOutput)
         End If
 
-        If strComment IsNot Nothing Then
-            SetComment(strComment)
-        Else
-            SetComment(clsInstatOptionsDefaults.DEFAULTstrComment)
+        If strComment Is Nothing Then
+            SetComment(Translations.GetTranslation(clsInstatOptionsDefaults.DEFAULTstrComment))
         End If
 
         If strGraphDisplayOption IsNot Nothing Then

diff --git a/instat/dlgOptions.vb b/instat/dlgOptions.vb
@@ -240,6 +240,12 @@ Public Class dlgOptions
         autoTranslate(Me)
         SetView() 'needed to ensure that the tree view in the left panel correctly displays translated text
 
+        If strCurrLanguageCulture <> strPrevLanguageCulture Then
+            Dim strCommentNewLanguage = Translations.GetTranslation(clsInstatOptionsDefaults.DEFAULTstrComment)
+            frmMain.clsInstatOptions.SetComment(strCommentNewLanguage)
+            ucrInputComment.SetName(strCommentNewLanguage)
+        End If
+
         If frmMain.Visible AndAlso strCurrLanguageCulture <> strPrevLanguageCulture Then
             frmMain.TranslateFrmMainMenu()
         End If

diff --git a/instat/dlgTransformText.vb b/instat/dlgTransformText.vb
@@ -58,8 +58,7 @@ Public Class dlgTransformText
         ucrReceiverTransformText.Selector = ucrSelectorForTransformText
         ucrReceiverTransformText.bUseFilteredData = False
         ucrReceiverTransformText.SetMeAsReceiver()
-        ucrReceiverTransformText.SetIncludedDataTypes({"factor", "character"})
-        ucrReceiverTransformText.strSelectorHeading = "Characters"
+        ucrReceiverTransformText.strSelectorHeading = "Variables"
 
         'ucrRdoOptions
         ucrPnlOperation.AddRadioButton(rdoCase)