Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
68 changes: 68 additions & 0 deletions csharp/Platform.IO.Tests/ConsoleHelpersTests.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,68 @@
using System;
using System.Globalization;
using System.Threading;
using Xunit;

namespace Platform.IO.Tests
{
public class ConsoleHelpersTests
{
[Fact]
public void GetOrReadArgumentUsesLocalizedFormat()
{
var result = ConsoleHelpers.GetOrReadArgument(0, "arg1");
Assert.Equal("arg1", result);
}

[Fact]
public void GetOrReadArgumentWithIndexUsesLocalizedFormat()
{
var result = ConsoleHelpers.GetOrReadArgument(0, "arg1");
Assert.Equal("arg1", result);
}

[Fact]
public void ResourcesReturnLocalizedStrings()
{
var originalCulture = Thread.CurrentThread.CurrentUICulture;

try
{
Thread.CurrentThread.CurrentUICulture = new CultureInfo("en");
Assert.Equal("Press any key to continue.", Resources.PressAnyKeyToContinue);
Assert.Equal("{0} argument", Resources.ArgumentPrompt);
Assert.Equal("{0}: ", Resources.InputPrompt);

Thread.CurrentThread.CurrentUICulture = new CultureInfo("ru");
Assert.Equal("Нажмите любую клавишу для продолжения.", Resources.PressAnyKeyToContinue);
Assert.Equal("{0} аргумент", Resources.ArgumentPrompt);
Assert.Equal("{0}: ", Resources.InputPrompt);
}
finally
{
Thread.CurrentThread.CurrentUICulture = originalCulture;
}
}

[Fact]
public void ArgumentPromptFormattingWorks()
{
var originalCulture = Thread.CurrentThread.CurrentUICulture;

try
{
Thread.CurrentThread.CurrentUICulture = new CultureInfo("en");
var englishPrompt = string.Format(Resources.ArgumentPrompt, 1);
Assert.Equal("1 argument", englishPrompt);

Thread.CurrentThread.CurrentUICulture = new CultureInfo("ru");
var russianPrompt = string.Format(Resources.ArgumentPrompt, 1);
Assert.Equal("1 аргумент", russianPrompt);
}
finally
{
Thread.CurrentThread.CurrentUICulture = originalCulture;
}
}
}
}
6 changes: 3 additions & 3 deletions csharp/Platform.IO/ConsoleHelpers.cs
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ public static class ConsoleHelpers
[MethodImpl(MethodImplOptions.AggressiveInlining)]
public static void PressAnyKeyToContinue()
{
Console.WriteLine("Press any key to continue.");
Console.WriteLine(Resources.PressAnyKeyToContinue);
Console.ReadKey();
}

Expand All @@ -40,7 +40,7 @@ public static void PressAnyKeyToContinue()
/// <para>Значение с указанным <paramref name="index"/>, извлечённое из массива <paramref name="args"/>, или введённое пользователем в консоли.</para>
/// </returns>
[MethodImpl(MethodImplOptions.AggressiveInlining)]
public static string GetOrReadArgument(int index, params string[] args) => GetOrReadArgument(index, $"{index + 1} argument", args);
public static string GetOrReadArgument(int index, params string[] args) => GetOrReadArgument(index, string.Format(Resources.ArgumentPrompt, index + 1), args);

/// <summary>
/// <para>Gets an argument's value with the specified <paramref name="index"/> from the <paramref name="args"/> array and if it's absent requests a user to input it in the console.</para>
Expand All @@ -67,7 +67,7 @@ public static string GetOrReadArgument(int index, string readMessage, params str
{
if (!args.TryGetElement(index, out string result))
{
Console.Write($"{readMessage}: ");
Console.Write(string.Format(Resources.InputPrompt, readMessage));
result = Console.ReadLine();
}
if (string.IsNullOrEmpty(result))
Expand Down
21 changes: 19 additions & 2 deletions csharp/Platform.IO/Platform.IO.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<Description>LinksPlatform's Platform.IO Class Library</Description>
<Copyright>Konstantin Diachenko</Copyright>
<AssemblyTitle>Platform.IO</AssemblyTitle>
<VersionPrefix>0.5.1</VersionPrefix>
<VersionPrefix>0.6.0</VersionPrefix>
<Authors>Konstantin Diachenko</Authors>
<TargetFramework>net8</TargetFramework>
<AssemblyName>Platform.IO</AssemblyName>
Expand All @@ -23,8 +23,9 @@
<IncludeSymbols>true</IncludeSymbols>
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
<LangVersion>latest</LangVersion>
<PackageReleaseNotes>Update target framework from net7 to net8.</PackageReleaseNotes>
<PackageReleaseNotes>Add internationalization support for ConsoleHelpers messages.</PackageReleaseNotes>
<Nullable>enable</Nullable>
<EnableDefaultEmbeddedResourceItems>false</EnableDefaultEmbeddedResourceItems>
</PropertyGroup>

<ItemGroup>
Expand All @@ -36,4 +37,20 @@
<PackageReference Include="Platform.Unsafe" Version="0.6.1" />
</ItemGroup>

<ItemGroup>
<EmbeddedResource Include="Resources.resx">
<Generator>ResXFileCodeGenerator</Generator>
<LastGenOutput>Resources.Designer.cs</LastGenOutput>
</EmbeddedResource>
<EmbeddedResource Include="Resources.ru.resx" />
</ItemGroup>

<ItemGroup>
<Compile Update="Resources.Designer.cs">
<DesignTime>True</DesignTime>
<AutoGen>True</AutoGen>
<DependentUpon>Resources.resx</DependentUpon>
</Compile>
</ItemGroup>

</Project>
90 changes: 90 additions & 0 deletions csharp/Platform.IO/Resources.Designer.cs

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

131 changes: 131 additions & 0 deletions csharp/Platform.IO/Resources.resx
Original file line number Diff line number Diff line change
@@ -0,0 +1,131 @@
<?xml version="1.0" encoding="utf-8"?>
<root>
<!--
Microsoft ResX Schema

Version 2.0

The primary goals of this format is to allow a simple XML format
that is mostly human readable. The generation and parsing of the
various data types are done through the TypeConverter classes
associated with the data types.

Example:

... ado.net/XML headers & schema ...
<resheader name="resmimetype">text/microsoft-resx</resheader>
<resheader name="version">2.0</resheader>
<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
<data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
<value>[base64 mime encoded serialized .NET Framework object]</value>
</data>
<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>[base64 mime encoded serialized .NET Framework object]</value>
</data>

There are any number of "resheader" rows that contain simple
name/value pairs.

Each data row contains a name, and value. The row also contains a
type or mimetype. Type corresponds to a .NET class that support
text/value conversion through the TypeConverter architecture.
Classes that don't support this are serialized and stored with the
mimetype set.

The mimetype is used for serialized objects, and tells the
ResXResourceReader how to depersist the object. This is currently not
extensible. For a given mimetype the value must be set accordingly:

Note - application/x-microsoft.net.object.binary.base64 is the format
that the ResXResourceWriter will generate, however the reader can
read any of the formats listed below.

mimetype: application/x-microsoft.net.object.binary.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
: and then encoded with base64 encoding.

mimetype: application/x-microsoft.net.object.soap.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
: and then encoded with base64 encoding.

mimetype: application/x-microsoft.net.object.bytearray.base64
value : The object must be serialized into a byte array
: using a System.ComponentModel.TypeConverter
: and then encoded with base64 encoding.
-->
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
<xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
<xsd:element name="root" msdata:IsDataSet="true">
<xsd:complexType>
<xsd:choice maxOccurs="unbounded">
<xsd:element name="metadata">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" />
</xsd:sequence>
<xsd:attribute name="name" use="required" type="xsd:string" />
<xsd:attribute name="type" type="xsd:string" />
<xsd:attribute name="mimetype" type="xsd:string" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="assembly">
<xsd:complexType>
<xsd:attribute name="alias" type="xsd:string" />
<xsd:attribute name="name" type="xsd:string" />
</xsd:complexType>
</xsd:element>
<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" use="required" type="xsd:string" />
<xsd:attribute name="type" type="xsd:string" />
<xsd:attribute name="mimetype" type="xsd:string" />
<xsd:attribute ref="xml:space" />
</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" use="required" type="xsd:string" />
</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>2.0</value>
</resheader>
<resheader name="reader">
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<data name="PressAnyKeyToContinue" xml:space="preserve">
<value>Press any key to continue.</value>
<comment>Message displayed to user asking them to press any key</comment>
</data>
<data name="ArgumentPrompt" xml:space="preserve">
<value>{0} argument</value>
<comment>Format string for prompting user for argument number (e.g., "1 argument", "2 argument")</comment>
</data>
<data name="InputPrompt" xml:space="preserve">
<value>{0}: </value>
<comment>Format string for input prompt (e.g., "1 argument: ", "filename: ")</comment>
</data>
</root>
Loading
Loading