Merge pull request #80 from africanmathsinitiative/master

Updating master
Patowhiz · Oct 14, 2022 · 644249a · 644249a
2 parents e2b214b + 44afe0e
commit 644249a
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 10 deletions.
diff --git a/instat/dlgExportDataset.vb b/instat/dlgExportDataset.vb
@@ -22,9 +22,6 @@ Public Class dlgExportDataset
     Private clsDefaultFunction As New RFunction
 
     Private Sub dlgExportDataset_Load(sender As Object, e As EventArgs) Handles Me.Load
-        'temporarily commented out because it overwrites lblConfirm text contents
-        'autoTranslate(Me) 
-
         If bFirstLoad Then
             InitialiseDialog()
             bFirstLoad = False
@@ -34,6 +31,7 @@ Public Class dlgExportDataset
         End If
         SetRCodeForControls(bReset)
         bReset = False
+        autoTranslate(Me)
     End Sub
 
     Private Sub InitialiseDialog()

diff --git a/instat/translations/en/r_instat_not_menus.json b/instat/translations/en/r_instat_not_menus.json
@@ -3688,5 +3688,14 @@
   "Display As DataFrame": "Display As DataFrame",
   "Data Frame Name": "Data Frame Name",
   "Rename With": "Rename With",
-  "Rename Columns": "Rename Columns"}
-
+  "Rename Columns": "Rename Columns",
+  "Command runs without error": "Command runs without error",
+  "Command runs ok": "Command runs ok",
+  "Problem detected running Command or no output to display.": "Problem detected running Command or no output to display.",
+  "Command produced an error. Modify input before running.": "Command produced an error. Modify input before running.",
+  "Model produced an error or no output to display.": "Model produced an error or no output to display.",
+  "Model runs without error": "Model runs without error",
+  "Model runs ok": "Model runs ok",
+  "Problem detected running Model or no output to display.": "Problem detected running Model or no output to display.",
+  "Model produced an error. Modify input before running.": "Model produced an error. Modify input before running."
+}
diff --git a/instat/translations/rInstatTranslations.db b/instat/translations/rInstatTranslations.db
diff --git a/instat/ucrTry.vb b/instat/ucrTry.vb
@@ -151,21 +151,21 @@ Public Class ucrTry
                             ucrInputTryMessage.txtInput.BackColor = Color.White
                         Else
                             If bIsCommand Then
-                                ucrInputTryMessage.SetName(CommandModel & " runs without error")
+                                ucrInputTryMessage.SetName(Translations.GetTranslation(CommandModel & " runs without error"))
                                 ucrInputTryMessage.txtInput.BackColor = Color.LightGreen
                             ElseIf bIsModel Then
-                                ucrInputTryMessage.SetName(CommandModel & " runs ok")
+                                ucrInputTryMessage.SetName(Translations.GetTranslation(CommandModel & " runs ok"))
                                 ucrInputTryMessage.txtInput.BackColor = Color.LightGreen
                             End If
                         End If
                     Else
                         If bIsCommand Then
-                            ucrInputTryMessage.SetName(CommandModel & " produced an error or no output to display.")
+                            ucrInputTryMessage.SetName(Translations.GetTranslation(CommandModel & " produced an error or no output to display."))
                             ucrInputTryMessage.txtInput.BackColor = Color.LightCoral
                             strError = strErrorDetail
                             AddButtonInTryTextBox()
                         ElseIf bIsModel Then
-                            ucrInputTryMessage.SetName("Problem detected running " & CommandModel & " or no output to display.")
+                            ucrInputTryMessage.SetName(Translations.GetTranslation("Problem detected running " & CommandModel & " or no output to display."))
                             ucrInputTryMessage.txtInput.BackColor = Color.LightCoral
                             strError = strErrorDetail
                             AddButtonInTryTextBox()
@@ -174,7 +174,7 @@ Public Class ucrTry
                     End If
             End If
         Catch ex As Exception
-            ucrInputTryMessage.SetName(CommandModel & "produced an error. Modify input before running.")
+            ucrInputTryMessage.SetName(Translations.GetTranslation(CommandModel & " produced an error. Modify input before running."))
             strError = strErrorDetail
             ucrInputTryMessage.txtInput.BackColor = Color.LightCoral
             AddButtonInTryTextBox()