From 67113f1594f3af64436b709339125c2a263d56fa Mon Sep 17 00:00:00 2001 From: MeSophie <106779233+MeSophie@users.noreply.github.com> Date: Wed, 7 Sep 2022 09:45:57 +0200 Subject: [PATCH 1/2] Minor code changes --- instat/dlgExportDataset.vb | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/instat/dlgExportDataset.vb b/instat/dlgExportDataset.vb index 15b97138126..19fea61709e 100644 --- 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() From 2f7cd9b07978d5bf0f3f06c8771ef7f87a74911d Mon Sep 17 00:00:00 2001 From: lloyddewit Date: Thu, 15 Sep 2022 15:03:08 +0200 Subject: [PATCH 2/2] Ensured that the 'Try' message in the Calculator, and some other dialogs, is correctly translated (e.g. to/from French) --- .../translations/en/r_instat_not_menus.json | 13 +++++++++++-- instat/translations/rInstatTranslations.db | Bin 5492736 -> 5492736 bytes instat/ucrTry.vb | 10 +++++----- 3 files changed, 16 insertions(+), 7 deletions(-) diff --git a/instat/translations/en/r_instat_not_menus.json b/instat/translations/en/r_instat_not_menus.json index d4bdcca4d38..05f6ff524b1 100644 --- 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." +} \ No newline at end of file diff --git a/instat/translations/rInstatTranslations.db b/instat/translations/rInstatTranslations.db index 68c2ec2443b4b9c6a64459803bd2224c8c2fe11e..f8c9a96aa5079c9b9929318909fc1af98fa77f67 100644 GIT binary patch delta 2418 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 TFrTo1P)Vq=W`Dh~_u~HmKQlqf diff --git a/instat/ucrTry.vb b/instat/ucrTry.vb index 201957df359..dbc910d4bb8 100644 --- 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()