Merge remote-tracking branch 'CMS/develop' into develop

Thermo.Active/Controllers/WebApi/LanguageController.cs

@@ -172,27 +172,6 @@ namespace Thermo.Active.Controllers.WebApi
             // Read data from CN
             ncAdapter.numericalControl.NC_GetTranslatedThermoLabels(language, ref returnValue); 
 
-            //// Id start from 1
-            //for (int i = 1; i <= 1024; i++)
-            //{
-            //    // Get configurated alarms
-            //    var tmpAlarmConfig = InitialAlarmsConfig.Where(x => x.PlcId == i).FirstOrDefault();
-            //    // Default string
-            //    string message = string.Format(NOT_CONFIGURATED_ALARM_MESSAGE, i);
-            //    // If is configurated
-            //    if (tmpAlarmConfig != null)
-            //    {
-            //        // Find translated string
-            //        message = messages.Where(x => x.Key == tmpAlarmConfig.AlarmId).FirstOrDefault().Value;
-            //        if (message == null)
-            //            message = string.Format(NOT_FOUND_ALARM_MESSAGE, i);
-            //    }
-            //    // Add to dictionary
-            //    returnValue.Add(
-            //            ALARM_PREFIX + i,
-            //            message
-            //            );
-            //}
             return returnValue;
         }
 

Thermo.Active/Thermo.Active.csproj

@@ -267,6 +267,9 @@
     <Content Include="Dict\Labels_italian.txt">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
+    <Content Include="Dict\Messaggi_italian.txt">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
     <Content Include="SetupActive.iss" />
     <Content Include="wwwroot\.idea\encodings.xml" />
     <Content Include="wwwroot\.idea\misc.xml" />