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

Added Spanish ToWords Translation #151

Closed
wants to merge 3 commits into from
Closed
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
1 change: 1 addition & 0 deletions release_notes.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
###In Development
- [#171](https://github.com/MehdiK/Humanizer/pull/171): T4-Template fix: Using EnglishNumberToWordsConverter instead of 'ToWords()' while dogfooding the template with the library.
- [#151](https://github.com/MehdiK/Humanizer/pull/151): Added Spanish ToWords Translations

[Commits](https://github.com/MehdiK/Humanizer/compare/v1.19.1...master)

Expand Down
1 change: 1 addition & 0 deletions src/Humanizer.Tests/Humanizer.Tests.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,7 @@
<Compile Include="Localisation\cs\TimeSpanHumanizeTests.cs" />
<Compile Include="Localisation\da\DateHumanizeTests.cs" />
<Compile Include="Localisation\da\TimeSpanHumanizeTests.cs" />
<Compile Include="Localisation\es\NumberToWordsTests.cs" />
<Compile Include="Localisation\nb-NO\TimeSpanHumanizeTests.cs" />
<Compile Include="Localisation\pl\DateHumanizeTests.cs" />
<Compile Include="Localisation\pl\TimeSpanHumanizeTests.cs" />
Expand Down
51 changes: 51 additions & 0 deletions src/Humanizer.Tests/Localisation/es/NumberToWordsTests.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
using Xunit;
using Xunit.Extensions;

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

[Theory]
[InlineData(0, "cero")]
[InlineData(1, "uno")]
[InlineData(10, "diez")]
[InlineData(11, "once")]
[InlineData(122, "ciento veinte dos")]
[InlineData(3501, "tres mil quinientos uno")]
[InlineData(100, "cien")]
[InlineData(1000, "mil")]
[InlineData(100000, "cien mil")]
[InlineData(1000000, "millón")]
[InlineData(10000000, "diez millones")]
[InlineData(100000000, "cien millones")]
[InlineData(1000000000, "mil millones")]
[InlineData(111, "ciento once")]
[InlineData(1111, "mil ciento once")]
[InlineData(111111, "ciento once mil ciento once")]
[InlineData(1111111, "millón ciento once mil ciento once")]
[InlineData(11111111, "once millones ciento once mil ciento once")]
[InlineData(111111111, "ciento once millones ciento once mil ciento once")]
[InlineData(1111111111, "mil millones ciento once millones ciento once mil ciento once")]
[InlineData(123, "ciento veinte tres")]
[InlineData(1234, "mil doscientos treinta y cuatro")]
[InlineData(12345, "doce mil trescientos cuarenta y cinco")]
[InlineData(123456, "ciento veinte tres mil cuatrocientos cincuenta y seis")]
[InlineData(1234567, "millón doscientos treinta y cuatro mil quinientos sesenta y siete")]
[InlineData(12345678, "doce millones trescientos cuarenta y cinco mil seiscientos setenta y ocho")]
[InlineData(123456789, "ciento veinte tres millones cuatrocientos cincuenta y seis mil setecientos ochenta y nueve")]
[InlineData(1234567890, "mil millones doscientos treinta y cuatro millones quinientos sesenta y siete mil ochocientos noventa")]
[InlineData(15, "quince")]
[InlineData(16, "dieciséis")]
[InlineData(25, "veinte cinco")]
[InlineData(35, "treinta y cinco")]
[InlineData(1999, "mil novecientos noventa y nueve")]
[InlineData(2014, "dos mil catorce")]
[InlineData(2048, "dos mil cuarenta y ocho")]
public void ToWordsSpanish(int number, string expected)
{
Assert.Equal(expected, number.ToWords());
}
}
}
1 change: 1 addition & 0 deletions src/Humanizer/Humanizer.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,7 @@
<Compile Include="Localisation\NumberToWords\INumberToWordsConverter.cs" />
<Compile Include="Localisation\Formatters\CzechSlovakPolishFormatter.cs" />
<Compile Include="Localisation\Tense.cs" />
<Compile Include="Localisation\NumberToWords\SpanishNumberToWordsConverter.cs" />
<Compile Include="TimeSpanHumanizeExtensions.cs" />
<Compile Include="FluentDate\In.SomeTimeFrom.cs">
<AutoGen>True</AutoGen>
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,89 @@
using Humanizer.Localisation.NumberToWords;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;

namespace Humanizer {
public class SpanishNumberToWordsConverter : INumberToWordsConverter {
private static readonly string[] HundredsMap = { "cero", "ciento", "doscientos", "trescientos", "cuatrocientos", "quinientos", "seiscientos", "setecientos", "ochocientos", "novecientos" };
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" };
private static readonly string[] TensMap = { "cero", "diez", "veinte", "treinta", "cuarenta", "cincuenta", "sesenta", "setenta", "ochenta", "noventa" };

public string Convert(int number)
{
if (number == 0)
return "cero";

if (number < 0)
return string.Format("menos {0}", Convert(Math.Abs(number)));

var parts = new List<string>();

if ((number / 1000000000) > 0)
{
if (number / 1000000000 == 1)
parts.Add(string.Format("mil millones", Convert(number / 1000000000)));
else
parts.Add(string.Format("{0} mil millones", Convert(number / 1000000000)));
number %= 1000000000;
}

if ((number / 1000000) > 0)
{
if (number / 1000000 == 1)
parts.Add(string.Format("millón", Convert(number / 1000000)));
else
parts.Add(string.Format("{0} millones", Convert(number / 1000000)));
number %= 1000000;
}

if ((number / 1000) > 0)
{
if (number / 1000 == 1)
parts.Add(string.Format("mil", Convert(number / 1000)));
else
parts.Add(string.Format("{0} mil", Convert(number / 1000)));
number %= 1000;
}

if ((number / 100) > 0)
{
if (number == 100)
parts.Add(string.Format("cien", Convert(number / 100)));
else
parts.Add(HundredsMap[(number / 100)]);

number %= 100;
}

if (number > 0)
{
if (number < 20)
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);
}
else
{
var lastPart = TensMap[number / 10];
if ((number % 10) > 0)
lastPart += string.Format(" y {0}", UnitsMap[number % 10]);

parts.Add(lastPart);
}
}

return string.Join(" ", parts.ToArray());
}

public string ConvertToOrdinal(int number)
{
throw new NotImplementedException();
}
}
}
17 changes: 8 additions & 9 deletions src/Humanizer/NumberToWordsExtension.cs
Original file line number Diff line number Diff line change
Expand Up @@ -3,34 +3,33 @@
using System.Globalization;
using Humanizer.Localisation.NumberToWords;

namespace Humanizer
{
namespace Humanizer {
/// <summary>
/// Transform a number into words; e.g. 1 => one
/// </summary>
public static class NumberToWordsExtension
{
public static class NumberToWordsExtension {
private static readonly IDictionary<string, Func<INumberToWordsConverter>> ConverterFactories =
new Dictionary<string, Func<INumberToWordsConverter>>
{
{ "en", () => new EnglishNumberToWordsConverter() },
{ "ar", () => new ArabicNumberToWordsConverter() },
{ "fa", () => new FarsiNumberToWordsConverter() }
{ "fa", () => new FarsiNumberToWordsConverter() },
{ "es", () => new SpanishNumberToWordsConverter() }
};

/// <summary>
/// 3501.ToWords() -> "three thousand five hundred and one"
/// </summary>
/// <param name="number">Number to be turned to words</param>
/// <returns></returns>
public static string ToWords(this int number)
public static string ToWords(this int number)
{
return Converter.Convert(number);
}

private static INumberToWordsConverter Converter
private static INumberToWordsConverter Converter
{
get
get
{
Func<INumberToWordsConverter> converterFactory;
if (ConverterFactories.TryGetValue(CultureInfo.CurrentUICulture.TwoLetterISOLanguageName, out converterFactory))
Expand All @@ -40,4 +39,4 @@ private static INumberToWordsConverter Converter
}
}
}
}
}