MS WISAG

app/DD_PM_WINDREAM/ClassAllgemeineFunktionen.vb

@@ -6,12 +6,22 @@ Imports WINDREAMLib
 Public Class ClassAllgemeineFunktionen
     Public Shared Function GUI_LANGUAGE_INFO(pTITLE As String)
         Dim oFilteredDatatable As DataTable = CURRENT_DT_GUI_LANGUAGE_PHRASES.Clone()
-        Dim oExpression = $"LANGUAGE = '{USER_LANGUAGE}' AND TITLE = '{pTITLE}'"
+        Dim oExpression = $"LANGUAGE ='{USER_LANGUAGE}' AND TITLE = '{pTITLE}'"
         CURRENT_DT_GUI_LANGUAGE_PHRASES.Select(oExpression).CopyToDataTable(oFilteredDatatable, LoadOption.PreserveChanges)
         If oFilteredDatatable.Rows.Count = 1 Then
-            Return oFilteredDatatable.Rows(0).Item("STRING1")
+            If oFilteredDatatable.Rows(0).Item("CAPT_TYPE") = "MsgBox" Then
+                Return oFilteredDatatable
+            Else
+                If oFilteredDatatable.Rows(0).Item("STRING2") <> String.Empty Then
+                    Return oFilteredDatatable
+                Else
+                    Return oFilteredDatatable.Rows(0).Item("STRING1")
+                End If
+
+            End If
+
         Else
-            Return ""
+            Return oFilteredDatatable
         End If
     End Function
     Public Shared Function GUI_LANGUAGE_MSGBOX(pTITLE As String)