Update config with titel for #29 - Fix En-En local. bug

sbidy · Jan 30, 2020 · ed93422 · ed93422
1 parent 1804cd6
commit ed93422
Show file tree

Hide file tree

Showing 3 changed files with 40 additions and 4 deletions.
diff --git a/privacyIDEAADFSProvider/AdapterPresentationForm.cs b/privacyIDEAADFSProvider/AdapterPresentationForm.cs
@@ -1,4 +1,5 @@
 using Microsoft.IdentityServer.Web.Authentication.External;
+using System.Diagnostics;
 
 namespace privacyIDEAADFSProvider
 {
@@ -27,7 +28,10 @@ public string GetFormHtml(int lcid)
             {
                 foreach (ADFSinterface adfsui in inter)
                 {
-                    if (adfsui.LICD == lcid.ToString())
+#if DEBUG
+                Debug.WriteLine("LICD: "+adfsui.LICD+" - "+ lcid.ToString());
+#endif
+                    if ((int)adfsui.LICD == (int)lcid)
                     {
                         errormessage = adfsui.errormessage;
                         wellcomemassage = adfsui.wellcomemessage;
@@ -64,7 +68,20 @@ public string GetFormPreRenderHtml(int lcid)
         //returns the title string for the web page which presents the HTML form content to the end user
         public string GetPageTitle(int lcid)
         {
-            return "privacyIDEA OTP Adapter";
+            foreach (ADFSinterface adfsui in inter)
+            {
+                if ((int)adfsui.LICD == (int)lcid)
+                {
+                    return adfsui.titel;
+                }
+                // fallback to EN-US if nothing is defined
+                else
+                {
+                    return "privacyIDEA OTP Adapter";
+                }
+            }
+            // in case of failure
+            return "privacyIDEA OTP Adapter E";
         }
 
     }

diff --git a/privacyIDEAADFSProvider/config.cs b/privacyIDEAADFSProvider/config.cs
@@ -142,7 +142,8 @@ public partial class ADFSinterface
 
         private string errormessageField;
         private string wellcomemessageField;
-        private string lICDField;
+        private int lICDField;
+        private string titelField;
 
         /// <remarks/>
         [System.Xml.Serialization.XmlElementAttribute(Form = System.Xml.Schema.XmlSchemaForm.Unqualified)]
@@ -171,10 +172,23 @@ public string wellcomemessage
                 this.wellcomemessageField = value;
             }
         }
+        /// <remarks/>
+        [System.Xml.Serialization.XmlElementAttribute(Form = System.Xml.Schema.XmlSchemaForm.Unqualified)]
+        public string titel
+        {
+            get
+            {
+                return this.titelField;
+            }
+            set
+            {
+                this.titelField = value;
+            }
+        }
 
         /// <remarks/>
         [System.Xml.Serialization.XmlAttributeAttribute()]
-        public string LICD
+        public int LICD
         {
             get
             {

diff --git a/privacyIDEAADFSProvider/config.xml b/privacyIDEAADFSProvider/config.xml
@@ -16,16 +16,21 @@
   <adminuser></adminuser>
   <adminpw></adminpw>
 
+  <!-- UI SECTION -->
+
   <!-- 
         For localization, please use the LCID see https://docs.microsoft.com/en-us/previous-versions/windows/embedded/ms912047(v=winembedded.10) 
         Example: EN-US = 1033, DE-DE = 1031, FR-FR = 1036, SP-SP = 1034
   -->
+
   <interface LICD="1033">
     <errormessage>Login failed! Please try again!</errormessage>
     <wellcomemessage>Please provide the one-time-password:</wellcomemessage>
+    <titel>privacyIDEA OTP Adapter - EN</titel>
   </interface>
   <interface LICD="1031">
     <errormessage>Login fehlgeschlagen. Bitte versuchen Sie es erneut!</errormessage>
     <wellcomemessage>Bitte geben Sie ihren PIN und OTP Token ein:</wellcomemessage>
+    <titel>privacyIDEA OTP Adapter - DE</titel>
   </interface>
 </server>