85 Add LocalizedAttribute to LocalizedText LocaleIds (#89)

* Address Comments on Description and DisplayName * Added LocalizedAttribute * Apply LocalizedAttribute to Value LocaleIds
OPCF-Members · Jan 24, 2025 · 46e8072 · 46e8072
1 parent f1a1318
commit 46e8072
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 22 deletions.
diff --git a/NodeSetToAML.cs b/NodeSetToAML.cs
@@ -606,25 +606,24 @@ private void BuildLocalizedTextAttribute(
         {
             if( localizedTexts != null )
             {
+                CAEXObject findObject = m_cAEXDocument.FindByPath( 
+                    "AutomationMLBaseAttributeTypeLib/LocalizedAttribute" );
+                AttributeFamilyType localizedAttributeFamilyType = findObject as AttributeFamilyType;
+
                 if( localizedTexts.Length > 1 )
                 {
-                    AddModifyAttribute( seq, attributeName, "LocalizedText", localizedTexts[ 0 ].Value );
-
-                    AttributeType displayNameAttribute = seq[ attributeName ];
-                    if( displayNameAttribute != null )
+                    AttributeType root = AddModifyAttribute( seq, attributeName, 
+                        "LocalizedText", localizedTexts[ 0 ].Value ); ;
+                    if( root != null )
                     {
                         string previousLocaleId = string.Empty;
-                        string defaultLocaleId = GetLocaleId( localizedTexts[ 0 ], ref previousLocaleId );
-                        AttributeType arrayRoot = AddModifyAttribute( displayNameAttribute.Attribute, defaultLocaleId, "String",
-                            localizedTexts[ 0 ].Value );
-
-                        // Redo first element
-                        previousLocaleId = string.Empty;
                         for( int index = 0; index < localizedTexts.Length; index++ )
                         {
-                            string localeId = GetLocaleId( localizedTexts[ index ], ref previousLocaleId );
-                            AddModifyAttribute( arrayRoot.Attribute, "aml-lang=" + localeId,
-                                "String", localizedTexts[ index ].Value );
+                            NodeSet.LocalizedText localizedText = localizedTexts[ index ];
+                            string localeId = GetLocaleId( localizedText, ref previousLocaleId );
+                            AttributeType textAttribute = root.Attribute.Append( localeId );
+                            textAttribute.RecreateAttributeInstance( localizedAttributeFamilyType );
+                            textAttribute.Value = localizedText.Value;
                         }
                     }
                 }
@@ -638,7 +637,9 @@ private void BuildLocalizedTextAttribute(
 
                         if( !String.IsNullOrEmpty( localizedText.Locale ) )
                         {
-                            AddModifyAttribute( root.Attribute, localizedText.Locale, "LocalizedText", localizedText.Value );
+                            AttributeType textAttribute = root.Attribute.Append( localizedText.Locale );
+                            textAttribute.RecreateAttributeInstance( localizedAttributeFamilyType );
+                            textAttribute.Value = localizedText.Value;
                         }
                     }
                 }
@@ -986,8 +987,13 @@ private AttributeType AddModifyAttribute(AttributeSequence seq, string name, str
                                     a.DefaultAttributeValue = a.AttributeValue = localizedText.Text;
                                     if ( !string.IsNullOrEmpty( localizedText.Locale ) )
                                     {
-                                        AddModifyAttribute(a.Attribute, localizedText.Locale, 
-                                            "String", localizedText.Text);    
+                                        CAEXObject findObject = m_cAEXDocument.FindByPath(
+                                            "AutomationMLBaseAttributeTypeLib/LocalizedAttribute" );
+                                        AttributeFamilyType localizedAttributeFamilyType = 
+                                            findObject as AttributeFamilyType;
+                                        AttributeType textAttribute = a.Attribute.Append( localizedText.Locale );
+                                        textAttribute.RecreateAttributeInstance( localizedAttributeFamilyType );
+                                        textAttribute.Value = localizedText.Text;
                                     }
                                 }
 

diff --git a/Opc2Aml.csproj b/Opc2Aml.csproj
@@ -25,9 +25,9 @@
   <ItemGroup>
     <PackageReference Include="Aml.Engine" Version="3.1.1" />
     <PackageReference Include="Aml.Engine.Resources" Version="3.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Configuration" Version="9.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="9.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="9.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Configuration" Version="9.0.1" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="9.0.1" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="9.0.1" />
     <PackageReference Include="OPCFoundation.NetStandard.Opc.Ua" Version="1.5.374.158" />
   </ItemGroup>
 

diff --git a/SystemTest/TestLocalizedText.cs b/SystemTest/TestLocalizedText.cs
@@ -178,12 +178,11 @@ public void MultipleLocalizedText( string nodeId, string attributeName, string[]
         {
             SystemUnitClassType objectToTest = GetTestObject( nodeId );
             AttributeType topLevel = ValidateAttribute( objectToTest.Attribute, attributeName, text[ 0 ] );
-            AttributeType textLevel = ValidateAttribute( topLevel.Attribute, localeId[0], text[ 0 ] );
 
             for( int index = 0; index < localeId.Length; index++ )
             {
-                string subLocale = "aml-lang=" + localeId[ index ];  
-                ValidateAttribute( textLevel.Attribute, subLocale, text[index] );
+                string subLocale = localeId[ index ];  
+                ValidateAttribute( topLevel.Attribute, subLocale, text[index] );
             }
         }