Spring/spring-net
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

removing conditional; unnecessary now that missing RESX file has been properly added

Browse Source
This commit is contained in:
Steve Bohlen
2015-11-25 08:36:13 -05:00
parent 48260daf89
commit f159d7765c
3 changed files with 50 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
test/Spring/Spring.Core.Tests/Context/Support/ResourceSetMessageSourceTests.cs
View File

@@ -275,21 +275,10 @@ namespace Spring.Context.Support
msgSource.GetMessage("MyMessage", new CultureInfo(CultureInfoUtils.SerbianLatinCultureName), new object[] { "Spring", ".NET" }), "message not as expected");
if (CultureInfoUtils.OperatingSystemIsAtLeastWindows10Build10586)
{
Assert.AreEqual("Ovo je Spring.NET",
Assert.AreEqual("Ово је Spring.NET",
msgSource.GetMessage("MyMessage", new CultureInfo(CultureInfoUtils.SerbianCyrillicCultureName),
new object[] { "Spring", ".NET" }), "message not as expected");
}
else
{
Assert.AreEqual("Ово је Spring.NET",
msgSource.GetMessage("MyMessage", new CultureInfo(CultureInfoUtils.SerbianCyrillicCultureName),
new object[] { "Spring", ".NET" }), "message not as expected");
}
Assert.AreEqual("Visual Studio voli Spring.NET",
msgSource.GetMessage("MyNewMessage", new CultureInfo(CultureInfoUtils.SerbianCyrillicCultureName), new object[] { "Spring", ".NET" }), "message not as expected");

45
test/Spring/Spring.Core.Tests/Resources/Spring.Context.Tests.sr-Cyrl-RS.resx Normal file
View File

@@ -0,0 +1,45 @@
<?xml version="1.0" encoding="utf-8" ?>
<root>
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
<xsd:element name="root" msdata:IsDataSet="true">
<xsd:complexType>
<xsd:choice maxOccurs="unbounded">
<xsd:element name="data">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" />
<xsd:attribute name="type" type="xsd:string" />
<xsd:attribute name="mimetype" type="xsd:string" />
</xsd:complexType>
</xsd:element>
<xsd:element name="resheader">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" />
</xsd:complexType>
</xsd:element>
</xsd:choice>
</xsd:complexType>
</xsd:element>
</xsd:schema>
<resheader name="ResMimeType">
<value>text/microsoft-resx</value>
</resheader>
<resheader name="Version">
<value>1.0.0.0</value>
</resheader>
<resheader name="Reader">
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<resheader name="Writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<data name="MyMessage">
<value>Ово је {0}{1}</value>
</data>
</root>

3
test/Spring/Spring.Core.Tests/Spring.Core.Tests.2010.csproj
View File

@@ -955,6 +955,9 @@
<Content Include="Spring.Core.Tests.dll.config" />
<EmbeddedResource Include="Resources\Spring.Context.Tests.de-AT.resx" />
<EmbeddedResource Include="Resources\Spring.Context.Tests.de.resx" />
<EmbeddedResource Include="Resources\Spring.Context.Tests.sr-Cyrl-RS.resx">
<SubType>Designer</SubType>
</EmbeddedResource>
<EmbeddedResource Include="Resources\Tesla.sr-Cyrl-RS.resx">
<SubType>Designer</SubType>
</EmbeddedResource>