Skip to content

Commit 4f3149e

Browse files
1nf0rmagician1nf0rmagician
committed
Merge pull request [#116 ](PHOENIXCONTACT/MORYX-Factory#116) from PHOENIXCONTACT/fix/missing-localization-for-processdatalistenerconfig
Fix missing localization for `ProcessDataListenerConfig` (cherry picked from commit 28c1c0c2d1ffce75cd111d740c2834d9762377ec)
1 parent 37d981f commit 4f3149e

File tree

7 files changed

+712
-4
lines changed

7 files changed

+712
-4
lines changed

‎src/Moryx.ProcessData/Listener/ProcessDataListenerConfig.cs‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,10 @@
22
// Licensed under the Apache License, Version 2.0
33

44
using System.ComponentModel;
5+
using System.ComponentModel.DataAnnotations;
56
using System.Runtime.Serialization;
67
using Moryx.Modules;
8+
using Moryx.ProcessData.Localization;
79
using Moryx.Serialization;
810

911
namespace Moryx.ProcessData.Listener
@@ -30,13 +32,14 @@ public ProcessDataListenerConfig()
3032
/// Unique Name of the Listener
3133
/// </summary>
3234
[DataMember]
33-
[Description("Unique Name of the Listener")]
35+
[Display(Name = nameof(Strings.LISTENERNAME), Description = nameof(Strings.LISTENERNAME_DESCRIPTION), ResourceType = typeof(Strings))]
3436
public string ListenerName { get; set; }
3537

3638
/// <summary>
3739
/// Configuration for the occurred measurand. They can be enabled or disabled.
3840
/// </summary>
3941
[DataMember]
42+
[Display(Name = nameof(Strings.MEASURAND_CONFIG), ResourceType = typeof(Strings))]
4043
public List<MeasurandConfig> MeasurandConfigs { get; set; }
4144
}
4245

@@ -50,14 +53,14 @@ public class MeasurandConfig
5053
/// Name of the measurand
5154
/// </summary>
5255
[DataMember]
53-
[Description("Name of the measurand")]
56+
[Display(Name = nameof(Strings.MEASURAND_NAME), Description = nameof(Strings.MEASURAND_NAME_DESCRIPTION), ResourceType = typeof(Strings))]
5457
public string Name { get; set; }
5558

5659
/// <summary>
5760
/// Indicator if measurand processing is enabled
5861
/// </summary>
5962
[DataMember]
60-
[Description("If enabled, process data will be processed")]
63+
[Display(Name = nameof(Strings.IS_ENABLED), Description = nameof(Strings.IS_ENABLED_DESCRIPTION), ResourceType = typeof(Strings))]
6164
public bool IsEnabled { get; set; }
6265

6366
/// <inheritdoc />
@@ -67,4 +70,4 @@ public override string ToString()
6770
return $"{Name}: {status}";
6871
}
6972
}
70-
}
73+
}

‎src/Moryx.ProcessData/Localization/Strings.Designer.cs‎

Lines changed: 126 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/Moryx.ProcessData/Localization/Strings.de.resx‎

Lines changed: 141 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,141 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<root>
3+
<!--
4+
Microsoft ResX Schema
5+
6+
Version 2.0
7+
8+
The primary goals of this format is to allow a simple XML format
9+
that is mostly human readable. The generation and parsing of the
10+
various data types are done through the TypeConverter classes
11+
associated with the data types.
12+
13+
Example:
14+
15+
... ado.net/XML headers & schema ...
16+
<resheader name="resmimetype">text/microsoft-resx</resheader>
17+
<resheader name="version">2.0</resheader>
18+
<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
19+
<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
20+
<data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
21+
<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
22+
<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
23+
<value>[base64 mime encoded serialized .NET Framework object]</value>
24+
</data>
25+
<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
26+
<value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
27+
<comment>This is a comment</comment>
28+
</data>
29+
30+
There are any number of "resheader" rows that contain simple
31+
name/value pairs.
32+
33+
Each data row contains a name, and value. The row also contains a
34+
type or mimetype. Type corresponds to a .NET class that support
35+
text/value conversion through the TypeConverter architecture.
36+
Classes that don't support this are serialized and stored with the
37+
mimetype set.
38+
39+
The mimetype is used for serialized objects, and tells the
40+
ResXResourceReader how to depersist the object. This is currently not
41+
extensible. For a given mimetype the value must be set accordingly:
42+
43+
Note - application/x-microsoft.net.object.binary.base64 is the format
44+
that the ResXResourceWriter will generate, however the reader can
45+
read any of the formats listed below.
46+
47+
mimetype: application/x-microsoft.net.object.binary.base64
48+
value : The object must be serialized with
49+
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
50+
: and then encoded with base64 encoding.
51+
52+
mimetype: application/x-microsoft.net.object.soap.base64
53+
value : The object must be serialized with
54+
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
55+
: and then encoded with base64 encoding.
56+
57+
mimetype: application/x-microsoft.net.object.bytearray.base64
58+
value : The object must be serialized into a byte array
59+
: using a System.ComponentModel.TypeConverter
60+
: and then encoded with base64 encoding.
61+
-->
62+
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
63+
<xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
64+
<xsd:element name="root" msdata:IsDataSet="true">
65+
<xsd:complexType>
66+
<xsd:choice maxOccurs="unbounded">
67+
<xsd:element name="metadata">
68+
<xsd:complexType>
69+
<xsd:sequence>
70+
<xsd:element name="value" type="xsd:string" minOccurs="0" />
71+
</xsd:sequence>
72+
<xsd:attribute name="name" use="required" type="xsd:string" />
73+
<xsd:attribute name="type" type="xsd:string" />
74+
<xsd:attribute name="mimetype" type="xsd:string" />
75+
<xsd:attribute ref="xml:space" />
76+
</xsd:complexType>
77+
</xsd:element>
78+
<xsd:element name="assembly">
79+
<xsd:complexType>
80+
<xsd:attribute name="alias" type="xsd:string" />
81+
<xsd:attribute name="name" type="xsd:string" />
82+
</xsd:complexType>
83+
</xsd:element>
84+
<xsd:element name="data">
85+
<xsd:complexType>
86+
<xsd:sequence>
87+
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
88+
<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
89+
</xsd:sequence>
90+
<xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
91+
<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
92+
<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
93+
<xsd:attribute ref="xml:space" />
94+
</xsd:complexType>
95+
</xsd:element>
96+
<xsd:element name="resheader">
97+
<xsd:complexType>
98+
<xsd:sequence>
99+
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
100+
</xsd:sequence>
101+
<xsd:attribute name="name" type="xsd:string" use="required" />
102+
</xsd:complexType>
103+
</xsd:element>
104+
</xsd:choice>
105+
</xsd:complexType>
106+
</xsd:element>
107+
</xsd:schema>
108+
<resheader name="resmimetype">
109+
<value>text/microsoft-resx</value>
110+
</resheader>
111+
<resheader name="version">
112+
<value>2.0</value>
113+
</resheader>
114+
<resheader name="reader">
115+
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
116+
</resheader>
117+
<resheader name="writer">
118+
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
119+
</resheader>
120+
<data name="IS_ENABLED" xml:space="preserve">
121+
<value>Ist aktiviert</value>
122+
</data>
123+
<data name="IS_ENABLED_DESCRIPTION" xml:space="preserve">
124+
<value>Wenn aktiviert, werden Prozessdaten verarbeitet</value>
125+
</data>
126+
<data name="LISTENERNAME" xml:space="preserve">
127+
<value>Name des Listeners</value>
128+
</data>
129+
<data name="LISTENERNAME_DESCRIPTION" xml:space="preserve">
130+
<value>Eindeutiger Name des Listeners</value>
131+
</data>
132+
<data name="MEASURAND_CONFIG" xml:space="preserve">
133+
<value>Messgrößenkonfiguration</value>
134+
</data>
135+
<data name="MEASURAND_NAME" xml:space="preserve">
136+
<value>Name</value>
137+
</data>
138+
<data name="MEASURAND_NAME_DESCRIPTION" xml:space="preserve">
139+
<value>Name der Messgröße</value>
140+
</data>
141+
</root>

0 commit comments

Comments
 (0)