Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add new overload for Ordinalize that accepts a CultureInfo #595

Merged
merged 5 commits into from
Apr 4, 2019
Merged
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
45 changes: 44 additions & 1 deletion src/Humanizer.Tests.Shared/OrdinalizeTests.cs
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
using Xunit;
using System.Globalization;
using Xunit;

namespace Humanizer.Tests
{
Expand Down Expand Up @@ -95,5 +96,47 @@ public void OrdinalizeStringGenderIsImmaterial(string number)
var feminineOrdinalized = number.Ordinalize(GrammaticalGender.Feminine);
Assert.Equal(masculineOrdinalized, feminineOrdinalized);
}

[Theory]
[InlineData("en-US", "1", "1st")]
[InlineData("nl-NL", "1", "1e")]
public void OrdinalizeStringWithCultureOverridesCurrentCulture(string cultureName, string number, string ordinalized)
{
var culture = new CultureInfo(cultureName);
Assert.Equal(number.Ordinalize(culture), ordinalized);
}

[Theory]
[InlineData("en-US", 1, "1st")]
[InlineData("nl-NL", 1, "1e")]
public void OrdinalizeNumberWithCultureOverridesCurrentCulture(string cultureName, int number, string ordinalized)
{
var culture = new CultureInfo(cultureName);
Assert.Equal(number.Ordinalize(culture), ordinalized);
}

[Theory]
[InlineData(0)]
[InlineData(1)]
[InlineData(8)]
public void OrdinalizeNumberWithOverridenCultureGenderIsImmaterial(int number)
{
var culture = new CultureInfo("nl-NL");
var masculineOrdinalized = number.Ordinalize(GrammaticalGender.Masculine, culture);
var feminineOrdinalized = number.Ordinalize(GrammaticalGender.Feminine, culture);
Assert.Equal(masculineOrdinalized, feminineOrdinalized);
}

[Theory]
[InlineData("0")]
[InlineData("1")]
[InlineData("8")]
public void OrdinalizeStringWithOverridenGenderIsImmaterial(string number)
{
var culture = new CultureInfo("nl-NL");
var masculineOrdinalized = number.Ordinalize(GrammaticalGender.Masculine, culture);
var feminineOrdinalized = number.Ordinalize(GrammaticalGender.Feminine, culture);
Assert.Equal(masculineOrdinalized, feminineOrdinalized);
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -978,9 +978,13 @@ namespace Humanizer
public class static OrdinalizeExtensions
{
public static string Ordinalize(this string numberString) { }
public static string Ordinalize(this string numberString, System.Globalization.CultureInfo culture) { }
public static string Ordinalize(this string numberString, Humanizer.GrammaticalGender gender) { }
public static string Ordinalize(this string numberString, Humanizer.GrammaticalGender gender, System.Globalization.CultureInfo culture) { }
public static string Ordinalize(this int number) { }
public static string Ordinalize(this int number, System.Globalization.CultureInfo culture) { }
public static string Ordinalize(this int number, Humanizer.GrammaticalGender gender) { }
public static string Ordinalize(this int number, Humanizer.GrammaticalGender gender, System.Globalization.CultureInfo culture) { }
}
public enum Plurality
{
Expand Down
54 changes: 53 additions & 1 deletion src/Humanizer/OrdinalizeExtensions.cs
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,17 @@ public static string Ordinalize(this string numberString)
return Configurator.Ordinalizer.Convert(int.Parse(numberString), numberString);
}

/// <summary>
/// Turns a number into an ordinal string used to denote the position in an ordered sequence such as 1st, 2nd, 3rd, 4th.
/// </summary>
/// <param name="numberString">The number, in string, to be ordinalized</param>
/// <param name="culture">Culture to use. If null, current thread's UI culture is used.</param>
/// <returns></returns>
public static string Ordinalize(this string numberString, CultureInfo culture)
{
return Configurator.Ordinalizers.ResolveForCulture(culture).Convert(int.Parse(numberString, culture), numberString);
}

/// <summary>
/// Turns a number into an ordinal string used to denote the position in an ordered sequence such as 1st, 2nd, 3rd, 4th.
/// Gender for Brazilian Portuguese locale
Expand All @@ -32,6 +43,21 @@ public static string Ordinalize(this string numberString, GrammaticalGender gend
return Configurator.Ordinalizer.Convert(int.Parse(numberString), numberString, gender);
}

/// <summary>
/// Turns a number into an ordinal string used to denote the position in an ordered sequence such as 1st, 2nd, 3rd, 4th.
/// Gender for Brazilian Portuguese locale
/// "1".Ordinalize(GrammaticalGender.Masculine) -> "1º"
/// "1".Ordinalize(GrammaticalGender.Feminine) -> "1ª"
/// </summary>
/// <param name="numberString">The number, in string, to be ordinalized</param>
/// <param name="gender">The grammatical gender to use for output words</param>
/// <param name="culture">Culture to use. If null, current thread's UI culture is used.</param>
/// <returns></returns>
public static string Ordinalize(this string numberString, GrammaticalGender gender, CultureInfo culture)
{
return Configurator.Ordinalizers.ResolveForCulture(culture).Convert(int.Parse(numberString, culture), numberString, gender);
}

/// <summary>
/// Turns a number into an ordinal number used to denote the position in an ordered sequence such as 1st, 2nd, 3rd, 4th.
/// </summary>
Expand All @@ -42,6 +68,17 @@ public static string Ordinalize(this int number)
return Configurator.Ordinalizer.Convert(number, number.ToString(CultureInfo.InvariantCulture));
}

/// <summary>
/// Turns a number into an ordinal number used to denote the position in an ordered sequence such as 1st, 2nd, 3rd, 4th.
/// </summary>
/// <param name="number">The number to be ordinalized</param>
/// <param name="culture">Culture to use. If null, current thread's UI culture is used.</param>
/// <returns></returns>
public static string Ordinalize(this int number, CultureInfo culture)
{
return Configurator.Ordinalizers.ResolveForCulture(culture).Convert(number, number.ToString(culture));
}

/// <summary>
/// Turns a number into an ordinal number used to denote the position in an ordered sequence such as 1st, 2nd, 3rd, 4th.
/// Gender for Brazilian Portuguese locale
Expand All @@ -55,5 +92,20 @@ public static string Ordinalize(this int number, GrammaticalGender gender)
{
return Configurator.Ordinalizer.Convert(number, number.ToString(CultureInfo.InvariantCulture), gender);
}

/// <summary>
/// Turns a number into an ordinal number used to denote the position in an ordered sequence such as 1st, 2nd, 3rd, 4th.
/// Gender for Brazilian Portuguese locale
/// 1.Ordinalize(GrammaticalGender.Masculine) -> "1º"
/// 1.Ordinalize(GrammaticalGender.Feminine) -> "1ª"
/// </summary>
/// <param name="number">The number to be ordinalized</param>
/// <param name="gender">The grammatical gender to use for output words</param>
/// <param name="culture">Culture to use. If null, current thread's UI culture is used.</param>
/// <returns></returns>
public static string Ordinalize(this int number, GrammaticalGender gender, CultureInfo culture)
{
return Configurator.Ordinalizers.ResolveForCulture(culture).Convert(number, number.ToString(culture), gender);
}
}
}
}