Merge pull request #7 from africanmathsinitiative/master

Update master

.github/workflows/compileCheck.yml

@@ -0,0 +1,57 @@
+name: compileCheck
+
+on:
+  push:
+    branches: [ "master" ]
+  pull_request:
+    branches: [ "master" ]
+
+jobs:
+
+  build:
+
+    strategy:
+      matrix:
+        configuration: [Debug, Release]
+
+    # running on 2019 so that .NET version 4.5 and lower can be used
+    runs-on: windows-2019 
+
+    # set variables
+    env:
+      Solution_Name: Instat.sln                         
+      Test_Project_Path: instat\instat.vbproj                
+
+    # check out r-instat
+    steps:
+    - name: Checkout
+      uses: actions/checkout@v3
+      with:
+        fetch-depth: 0
+
+    # Add  MSBuild to the PATH: https://github.com/microsoft/setup-msbuild
+    - name: Setup MSBuild.exe
+      uses: microsoft/[email protected]
+
+    # set up and restore NuGet packages
+    - name: Setup NuGet
+      uses: NuGet/[email protected]
+
+    - name: Restore NuGet
+      run: nuget restore $env:Solution_Name
+
+
+    # Restore the application to populate the obj folder with RuntimeIdentifiers
+    - name: Restore the application
+      run: msbuild $env:Solution_Name /t:Restore /p:Configuration=$env:Configuration
+      env:
+        Configuration: ${{ matrix.configuration }}
+
+    # Create the app package by building and packaging the Windows Application Packaging project
+    - name: Create the app package
+      run: msbuild $env:Test_Project_Path /p:Configuration=$env:Configuration /p:UapAppxPackageBuildMode=$env:Appx_Package_Build_Mode /p:AppxBundle=$env:Appx_Bundle /p:PackageCertificateKeyFile=GitHubActionsWorkflow.pfx /p:PackageCertificatePassword=${{ secrets.Pfx_Key }}
+      env:
+        Appx_Bundle: Always
+        Appx_Bundle_Platforms: x86|x64
+        Appx_Package_Build_Mode: StoreUpload
+        Configuration: ${{ matrix.configuration }}    

instat/dlgOptions.vb

@@ -84,13 +84,13 @@ Public Class dlgOptions
         ucrPnlGraphDisplay.AddRadioButton(rdoDisplayinRViewer)
         ucrPnlGraphDisplay.AddRadioButton(rdoDisplayinSeparateWindows)
         ucrInputLanguage.SetLinkedDisplayControl(lblLanguage)
-        ucrInputLanguage.SetItems({"English", "French", "Portuguese", "Kiswahili"})
+        ucrInputLanguage.SetItems({"English", "French", "Kiswahili", "Portuguese", "Russian"})
         ucrInputLanguage.SetDropDownStyleAsNonEditable()
 
         SetVisibleLanButton()
     End Sub
 
-     Private Sub LoadInstatOptions()
+    Private Sub LoadInstatOptions()
         ucrChkIncludeDefaultParams.Checked = frmMain.clsInstatOptions.bIncludeRDefaultParameters
         ucrChkAutoSave.Checked = frmMain.clsInstatOptions.bAutoSaveData
         SetOutputFont(frmMain.clsInstatOptions.fntOutput, frmMain.clsInstatOptions.clrOutput)
@@ -123,10 +123,12 @@ Public Class dlgOptions
                 ucrInputLanguage.SetText("English")
             Case "fr-FR"
                 ucrInputLanguage.SetText("French")
-            Case "pt-PT"
-                ucrInputLanguage.SetText("Portuguese")
             Case "sw-KE"
                 ucrInputLanguage.SetText("Kiswahili")
+            Case "pt-PT"
+                ucrInputLanguage.SetText("Portuguese")
+            Case "ru-RU"
+                ucrInputLanguage.SetText("Russian")
         End Select
 
         strPrevLanguageCulture = frmMain.clsInstatOptions.strLanguageCultureCode
@@ -261,10 +263,12 @@ Public Class dlgOptions
                 strCurrLanguageCulture = "en-GB"
             Case "French"
                 strCurrLanguageCulture = "fr-FR"
-            Case "Portuguese"
-                strCurrLanguageCulture = "pt-PT"
             Case "Kiswahili"
                 strCurrLanguageCulture = "sw-KE"
+            Case "Portuguese"
+                strCurrLanguageCulture = "pt-PT"
+            Case "Russian"
+                strCurrLanguageCulture = "ru-RU"
         End Select
         ApplyEnabled(True)
     End Sub