Skip to content

Commit f159d77

Browse files
committed
removing conditional; unnecessary now that missing RESX file has been properly added
1 parent 48260da commit f159d77

File tree

3 files changed

+50
-13
lines changed

3 files changed

+50
-13
lines changed

test/Spring/Spring.Core.Tests/Context/Support/ResourceSetMessageSourceTests.cs

Lines changed: 2 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -275,21 +275,10 @@ private void GetMessageLocalizationFallbacks(IMessageSource msgSource)
275275
msgSource.GetMessage("MyMessage", new CultureInfo(CultureInfoUtils.SerbianLatinCultureName), new object[] { "Spring", ".NET" }), "message not as expected");
276276

277277

278-
if (CultureInfoUtils.OperatingSystemIsAtLeastWindows10Build10586)
279-
{
280-
Assert.AreEqual("Ovo je Spring.NET",
278+
Assert.AreEqual("Ово је Spring.NET",
281279
msgSource.GetMessage("MyMessage", new CultureInfo(CultureInfoUtils.SerbianCyrillicCultureName),
282280
new object[] { "Spring", ".NET" }), "message not as expected");
283-
284-
}
285-
else
286-
{
287-
Assert.AreEqual("Ово је Spring.NET",
288-
msgSource.GetMessage("MyMessage", new CultureInfo(CultureInfoUtils.SerbianCyrillicCultureName),
289-
new object[] { "Spring", ".NET" }), "message not as expected");
290-
}
291-
292-
281+
293282
Assert.AreEqual("Visual Studio voli Spring.NET",
294283
msgSource.GetMessage("MyNewMessage", new CultureInfo(CultureInfoUtils.SerbianCyrillicCultureName), new object[] { "Spring", ".NET" }), "message not as expected");
295284

Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
<?xml version="1.0" encoding="utf-8" ?>
2+
<root>
3+
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
4+
<xsd:element name="root" msdata:IsDataSet="true">
5+
<xsd:complexType>
6+
<xsd:choice maxOccurs="unbounded">
7+
<xsd:element name="data">
8+
<xsd:complexType>
9+
<xsd:sequence>
10+
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
11+
<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
12+
</xsd:sequence>
13+
<xsd:attribute name="name" type="xsd:string" />
14+
<xsd:attribute name="type" type="xsd:string" />
15+
<xsd:attribute name="mimetype" type="xsd:string" />
16+
</xsd:complexType>
17+
</xsd:element>
18+
<xsd:element name="resheader">
19+
<xsd:complexType>
20+
<xsd:sequence>
21+
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
22+
</xsd:sequence>
23+
<xsd:attribute name="name" type="xsd:string" use="required" />
24+
</xsd:complexType>
25+
</xsd:element>
26+
</xsd:choice>
27+
</xsd:complexType>
28+
</xsd:element>
29+
</xsd:schema>
30+
<resheader name="ResMimeType">
31+
<value>text/microsoft-resx</value>
32+
</resheader>
33+
<resheader name="Version">
34+
<value>1.0.0.0</value>
35+
</resheader>
36+
<resheader name="Reader">
37+
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
38+
</resheader>
39+
<resheader name="Writer">
40+
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
41+
</resheader>
42+
<data name="MyMessage">
43+
<value>Ово је {0}{1}</value>
44+
</data>
45+
</root>

test/Spring/Spring.Core.Tests/Spring.Core.Tests.2010.csproj

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -955,6 +955,9 @@
955955
<Content Include="Spring.Core.Tests.dll.config" />
956956
<EmbeddedResource Include="Resources\Spring.Context.Tests.de-AT.resx" />
957957
<EmbeddedResource Include="Resources\Spring.Context.Tests.de.resx" />
958+
<EmbeddedResource Include="Resources\Spring.Context.Tests.sr-Cyrl-RS.resx">
959+
<SubType>Designer</SubType>
960+
</EmbeddedResource>
958961
<EmbeddedResource Include="Resources\Tesla.sr-Cyrl-RS.resx">
959962
<SubType>Designer</SubType>
960963
</EmbeddedResource>

0 commit comments

Comments
 (0)