NRCan#358 picklist methods now working with french defaulting to engl…

…ish if empty.
NRCan · Nov 25, 2024 · 6710276 · 6710276
1 parent d62ac5e
commit 6710276
Showing 1 changed file with 21 additions and 0 deletions.
diff --git a/GSCFieldApp/Services/Database/DataAccess.cs b/GSCFieldApp/Services/Database/DataAccess.cs
@@ -12,6 +12,7 @@
 using GSCFieldApp.Controls;
 using NetTopologySuite.Index.HPRtree;
 using Microsoft.Maui.Controls.PlatformConfiguration;
+using System.Globalization;
 
 namespace GSCFieldApp.Services.DatabaseServices
 {
@@ -345,6 +346,7 @@ public ComboBox GetComboboxListFromVocab(IEnumerable<Vocabularies> inVocab)
                 {
                     newItem.itemValue = vocabs.Code;
                 }
+
                 if (vocabs.Description == null)
                 {
                     newItem.itemName = string.Empty;
@@ -354,6 +356,25 @@ public ComboBox GetComboboxListFromVocab(IEnumerable<Vocabularies> inVocab)
                     newItem.itemName = vocabs.Description;
                 }
 
+                //Manage language description
+                if (CultureInfo.CurrentCulture.ToString().ToLower().Contains("fr"))
+                {
+
+                    if (vocabs.DescriptionFR != null && vocabs.DescriptionFR != string.Empty)
+                    {
+                        newItem.itemName = vocabs.DescriptionFR;
+                    }
+                    else
+                    {
+                        newItem.itemName = vocabs.Description;
+                    }
+
+                }
+                else
+                {
+                    newItem.itemName = vocabs.Description;
+                }
+
                 //Select default if stated in database
                 if (vocabs.DefaultValue != null && vocabs.DefaultValue == Dictionaries.DatabaseLiterals.boolYes)
                 {