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.

Sign up for GitHub

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

#461 implemented (Spanih cardinal feminines) #462

Closed
wants to merge 1 commit into from
Closed

#461 implemented (Spanih cardinal feminines) #462

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 1 addition & 0 deletions src/Humanizer.Tests/Humanizer.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,7 @@
<Compile Include="Localisation\bn-BD\TimeSpanHumanizeTests.cs" />
<Compile Include="Localisation\DefaultFormatterTests.cs" />
<Compile Include="Localisation\de\CollectionFormatterTests.cs" />
<Compile Include="Localisation\es\NumberToWordsFeminineTest.cs" />
<Compile Include="Localisation\fi-FI\NumberToWordsTests.cs" />
<Compile Include="Localisation\hr\DateHumanizeTests.cs" />
<Compile Include="Localisation\nb\DateHumanizeTests.cs" />
Expand Down
27 changes: 27 additions & 0 deletions src/Humanizer.Tests/Localisation/es/NumberToWordsFeminineTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
using Xunit;
using Xunit.Extensions;

namespace Humanizer.Tests.Localisation.es
{
public class NumberToWordsFeminineTests : AmbientCulture
{
public NumberToWordsFeminineTests() : base("es-ES") { }

[Theory]
[InlineData(1, "una")]
[InlineData(21, "veintiuna")]
[InlineData(31, "treinta y una")]
[InlineData(81, "ochenta y una")]
[InlineData(500, "quinientas")]
[InlineData(701, "setecientas una")]
[InlineData(3500, "tres mil quinientas")]
[InlineData(200121, "doscientas mil ciento veintiuna")]
[InlineData(200000121, "doscientos millones ciento veintiuna")]
[InlineData(1000001, "un millón una")]
public void ToWords(int number, string expected)
{
Assert.Equal(expected, number.ToWords(GrammaticalGender.Feminine));
}

}
}
44 changes: 30 additions & 14 deletions src/Humanizer/Localisation/NumberToWords/SpanishNumberToWordsConverter.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,11 @@ internal class SpanishNumberToWordsConverter : GenderedNumberToWordsConverter
private static readonly string[] UnitsMap = { "cero", "uno", "dos", "tres", "cuatro", "cinco", "seis", "siete", "ocho", "nueve", "diez", "once", "doce",
"trece", "catorce", "quince", "dieciséis", "diecisiete", "dieciocho", "diecinueve", "veinte", "veintiuno",
"veintidós", "veintitrés", "veinticuatro", "veinticinco", "veintiséis", "veintisiete", "veintiocho", "veintinueve"};
private const string Feminine1 = "una";
private const string Feminine21 = "veintiuna";
private static readonly string[] TensMap = { "cero", "diez", "veinte", "treinta", "cuarenta", "cincuenta", "sesenta", "setenta", "ochenta", "noventa" };
private static readonly string[] HundredsMap = { "cero", "ciento", "doscientos", "trescientos", "cuatrocientos", "quinientos", "seiscientos", "setecientos", "ochocientos", "novecientos" };
private static readonly string[] FeminineHundredsMap = { "cero", "ciento", "doscientas", "trescientas", "cuatrocientas", "quinientas", "seiscientas", "setecientas", "ochocientas", "novecientas" };

private static readonly Dictionary<int, string> Ordinals = new Dictionary<int, string>
{
Expand Down Expand Up @@ -38,7 +41,7 @@ public override string Convert(int number, GrammaticalGender gender)
if ((number / 1000000000) > 0)
{
parts.Add(number / 1000000000 == 1
? string.Format("mil millones")
? "mil millones"
: string.Format("{0} mil millones", Convert(number / 1000000000)));

number %= 1000000000;
Expand All @@ -47,7 +50,7 @@ public override string Convert(int number, GrammaticalGender gender)
if ((number / 1000000) > 0)
{
parts.Add(number / 1000000 == 1
? string.Format("un millón")
? "un millón"
: string.Format("{0} millones", Convert(number / 1000000)));

number %= 1000000;
Expand All @@ -56,34 +59,47 @@ public override string Convert(int number, GrammaticalGender gender)
if ((number / 1000) > 0)
{
parts.Add(number / 1000 == 1
? string.Format("mil")
: string.Format("{0} mil", Convert(number / 1000)));
? "mil"
: string.Format("{0} mil", Convert(number / 1000, gender)));

number %= 1000;
}

if ((number / 100) > 0)
{
parts.Add(number == 100 ? string.Format("cien") : HundredsMap[(number / 100)]);
parts.Add(number == 100
? "cien"
: gender == GrammaticalGender.Feminine
? FeminineHundredsMap[(number / 100)]
: HundredsMap[(number / 100)]);
number %= 100;
}

if (number > 0)
{
if (number < 30)
parts.Add(UnitsMap[number]);
else if (number > 20 && number < 30) {
var lastPart = TensMap[number / 10];
if ((number % 10) > 0)
lastPart += string.Format(" {0}", UnitsMap[number % 10]);

parts.Add(lastPart);
{
if (gender == GrammaticalGender.Feminine && (number == 1 || number == 21))
{
parts.Add(number == 1 ? Feminine1 : Feminine21);
}
else
{
parts.Add(UnitsMap[number]);
}
}
else
{
var lastPart = TensMap[number / 10];
if ((number % 10) > 0)
var lastPart = TensMap[number/10];
int units = number%10;
if (units == 1 && gender == GrammaticalGender.Feminine)
{
lastPart += " y una";
}
else if (units > 0)
{
lastPart += string.Format(" y {0}", UnitsMap[number % 10]);
}

parts.Add(lastPart);
}
Expand Down