-
Notifications
You must be signed in to change notification settings - Fork 968
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 hungarian translations, and hungarian number formatters #1501
Merged
Merged
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,87 @@ | ||
namespace hu; | ||
|
||
[UseCulture("hu-HU")] | ||
public class NumberToWordsTests | ||
{ | ||
private readonly HungarianNumberToWordsConverter converter = new(); | ||
|
||
[Theory] | ||
[InlineData(0, "nulla")] | ||
[InlineData(1, "egy")] | ||
[InlineData(2, "kettő")] | ||
[InlineData(10, "tíz")] | ||
[InlineData(11, "tizenegy")] | ||
[InlineData(20, "húsz")] | ||
[InlineData(21, "huszonegy")] | ||
[InlineData(100, "száz")] | ||
[InlineData(101, "százegy")] | ||
[InlineData(111, "száztizenegy")] | ||
[InlineData(200, "kétszáz")] | ||
[InlineData(999, "kilencszázkilencvenkilenc")] | ||
[InlineData(1000, "ezer")] | ||
[InlineData(1001, "ezeregy")] | ||
[InlineData(1002, "ezerkettő")] | ||
[InlineData(1111, "ezerszáztizenegy")] | ||
[InlineData(2000, "kétezer")] | ||
[InlineData(2001, "kétezer-egy")] | ||
[InlineData(2002, "kétezer-kettő")] | ||
[InlineData(2111, "kétezer-száztizenegy")] | ||
[InlineData(3000, "háromezer")] | ||
[InlineData(3001, "háromezer-egy")] | ||
[InlineData(3002, "háromezer-kettő")] | ||
[InlineData(3122, "háromezer-százhuszonkettő")] | ||
[InlineData(12345, "tizenkétezer-háromszáznegyvenöt")] | ||
[InlineData(123456, "százhuszonháromezer-négyszázötvenhat")] | ||
[InlineData(1234567, "egymillió-kétszázharmincnégyezer-ötszázhatvanhét")] | ||
[InlineData(12345678, "tizenkétmillió-háromszáznegyvenötezer-hatszázhetvennyolc")] | ||
[InlineData(123456789, "százhuszonhárommillió-négyszázötvenhatezer-hétszáznyolcvankilenc")] | ||
[InlineData(1234567890, "egymilliárd-kétszázharmincnégymillió-ötszázhatvanhétezer-nyolcszázkilencven")] | ||
[InlineData(1000000, "egymillió")] | ||
[InlineData(2000000, "kétmillió")] | ||
[InlineData(12000000, "tizenkétmillió")] | ||
[InlineData(-1, "mínusz egy")] | ||
[InlineData(-18, "mínusz tizennyolc")] | ||
public void TestNumberConversion(long number, string expected) => | ||
Assert.Equal(expected, converter.Convert(number)); | ||
|
||
|
||
[Theory] | ||
[InlineData(0, "nulladik")] | ||
[InlineData(1, "első")] | ||
[InlineData(2, "második")] | ||
[InlineData(10, "tizedik")] | ||
[InlineData(11, "tizenegyedik")] | ||
[InlineData(20, "huszadik")] | ||
[InlineData(21, "huszonegyedik")] | ||
[InlineData(100, "századik")] | ||
[InlineData(101, "százegyedik")] | ||
[InlineData(111, "száztizenegyedik")] | ||
[InlineData(200, "kétszázadik")] | ||
[InlineData(999, "kilencszázkilencvenkilencedik")] | ||
[InlineData(1000, "ezredik")] | ||
[InlineData(1001, "ezeregyedik")] | ||
[InlineData(1002, "ezerkettedik")] | ||
[InlineData(1111, "ezerszáztizenegyedik")] | ||
[InlineData(2000, "kétezredik")] | ||
[InlineData(2001, "kétezer-egyedik")] | ||
[InlineData(2002, "kétezer-kettedik")] | ||
[InlineData(2111, "kétezer-száztizenegyedik")] | ||
[InlineData(3000, "háromezredik")] | ||
[InlineData(3001, "háromezer-egyedik")] | ||
[InlineData(3002, "háromezer-kettedik")] | ||
[InlineData(3122, "háromezer-százhuszonkettedik")] | ||
[InlineData(12345, "tizenkétezer-háromszáznegyvenötödik")] | ||
[InlineData(123456, "százhuszonháromezer-négyszázötvenhatodik")] | ||
[InlineData(1234567, "egymillió-kétszázharmincnégyezer-ötszázhatvanhetedik")] | ||
[InlineData(12345678, "tizenkétmillió-háromszáznegyvenötezer-hatszázhetvennyolcadik")] | ||
[InlineData(123456789, "százhuszonhárommillió-négyszázötvenhatezer-hétszáznyolcvankilencedik")] | ||
[InlineData(1234567890, "egymilliárd-kétszázharmincnégymillió-ötszázhatvanhétezer-nyolcszázkilencvenedik")] | ||
[InlineData(1000000, "egymilliomodik")] | ||
[InlineData(2000000, "kétmilliomodik")] | ||
[InlineData(12000000, "tizenkétmilliomodik")] | ||
[InlineData(-1, "mínusz első")] | ||
[InlineData(-18, "mínusz tizennyolcadik")] | ||
public void TestOrdinalConversion(int number, string expected) => | ||
Assert.Equal(expected, converter.ConvertToOrdinal(number)); | ||
|
||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
167 changes: 167 additions & 0 deletions
167
src/Humanizer/Localisation/NumberToWords/HungarianNumberToWordsConverter.cs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,167 @@ | ||
namespace Humanizer; | ||
|
||
class HungarianNumberToWordsConverter : GenderlessNumberToWordsConverter | ||
{ | ||
// Units | ||
private static readonly string[] UnitsMap = ["", "egy", "kettő", "három", "négy", "öt", "hat", "hét", "nyolc", "kilenc"]; | ||
private static readonly string[] OrdinalUnitsMap = ["", "első", "második", "harmadik", "negyedik", "ötödik", "hatodik", "hetedik", "nyolcadik", "kilencedik"]; | ||
|
||
// Tens | ||
private static readonly string[] TensMap = ["", "tizen", "huszon", "harminc", "negyven", "ötven", "hatvan", "hetven", "nyolcvan", "kilencven"]; | ||
private static readonly string[] OrdinalTensMap = ["", "tizedik", "huszadik", "harmincadik", "negyvenedik", "ötvenedik", "hatvanadik", "hetvenedik", "nyolcvanadik", "kilencvenedik"]; | ||
|
||
// Hundreds | ||
private static readonly string[] HundredsMap = ["", "száz", "kétszáz", "háromszáz", "négyszáz", "ötszáz", "hatszáz", "hétszáz", "nyolcszáz", "kilencszáz"]; | ||
|
||
// Exceptional single numbers when used as ordinal numbers and the whole number is greater than 10 | ||
private static readonly Dictionary<long, string> OrdinalUnitsExceptions = new() | ||
{ | ||
{ | ||
1, "egyedik" | ||
}, | ||
{ | ||
2, "kettedik" | ||
} | ||
}; | ||
|
||
// Exceptional ten numbers when the number divided by 10 gives no remainder | ||
private static readonly Dictionary<long, string> WholeTensExceptions = new() | ||
{ | ||
{ | ||
10, "tíz" | ||
}, | ||
{ | ||
20, "húsz" | ||
} | ||
}; | ||
|
||
|
||
public override string Convert(long number) => ConvertInternal(number, false); | ||
|
||
public override string ConvertToOrdinal(int number) => ConvertInternal(number, true); | ||
|
||
private static string ConvertInternal(long number, bool isOrdinal) | ||
{ | ||
// Handle zero and negative numbers | ||
switch (number) | ||
{ | ||
case 0: | ||
return isOrdinal ? "nulladik" : "nulla"; | ||
case < 0: | ||
return $"mínusz {ConvertInternal(-number, isOrdinal)}"; | ||
} | ||
|
||
var isLessThanTen = number < 10; | ||
var parts = new List<string>(10); | ||
|
||
CollectParts(parts, ref number, isOrdinal, isLessThanTen, 1_000_000_000_000_000_000, "trillió", "trilliomodik"); | ||
CollectParts(parts, ref number, isOrdinal, isLessThanTen, 1_000_000_000_000_000, "billiárd", "billiárdodik"); | ||
CollectParts(parts, ref number, isOrdinal, isLessThanTen, 1_000_000_000_000, "billió", "billiomodik"); | ||
CollectParts(parts, ref number, isOrdinal, isLessThanTen, 1_000_000_000, "milliárd", "milliárdodik"); | ||
CollectParts(parts, ref number, isOrdinal, isLessThanTen, 1_000_000, "millió", "milliomodik"); | ||
|
||
// All numbers above 2000 should be separated by dashes per thousands | ||
if (2_000 <= number) | ||
{ | ||
CollectParts(parts, ref number, isOrdinal, isLessThanTen, 1_000, "ezer", "ezredik"); | ||
var underAThousandPart = GetUnderAThousandPart(number, isOrdinal, false, isLessThanTen); | ||
if (underAThousandPart != string.Empty) | ||
parts.Add(underAThousandPart); | ||
} | ||
else | ||
{ | ||
// In hungarian there is no separator between one thousand and the rest of the numbers | ||
var lastPart = 1_000 <= number ? GetOneThousandPart(ref number, isOrdinal) : ""; | ||
lastPart += GetUnderAThousandPart(number, isOrdinal, false, isLessThanTen); | ||
|
||
if (lastPart != string.Empty) | ||
parts.Add(lastPart); | ||
} | ||
|
||
return string.Join("-", parts); | ||
} | ||
|
||
// Thousands part for numbers between 1000 and 1999 | ||
static string GetOneThousandPart(ref long number, bool isOrdinal) | ||
{ | ||
const int divisor = 1_000; | ||
|
||
var oneThousandPart = isOrdinal && number == divisor ? "ezredik" : "ezer"; | ||
|
||
number %= divisor; | ||
return oneThousandPart; | ||
} | ||
|
||
private static void CollectParts(List<string> parts, ref long number, bool isOrdinal, bool isLessThanTen, | ||
long divisor, string word, | ||
string ordinal) | ||
{ | ||
var result = number / divisor; | ||
if (result == 0) | ||
{ | ||
return; | ||
} | ||
|
||
var prefixNumber = GetUnderAThousandPart(result, isOrdinal, true, isLessThanTen); | ||
|
||
number %= divisor; | ||
parts.Add(number == 0 && isOrdinal ? prefixNumber + ordinal : prefixNumber + word); | ||
} | ||
|
||
private static string GetUnderAThousandPart(long number, bool isOrdinal, bool isPrefix, bool originalLessThanTen) | ||
{ | ||
var numberString = ""; | ||
if (100 <= number) | ||
{ | ||
// Return hundred + "adik" if the number is exactly one of hundreds e.g.: századik, hétszázadik | ||
if (isOrdinal && number % 100 == 0) | ||
return HundredsMap[number / 100] + "adik"; | ||
|
||
numberString += HundredsMap[number / 100]; | ||
number %= 100; | ||
} | ||
|
||
if (10 <= number) | ||
{ | ||
// Return an ordinal ten if the number is exactly one of tens | ||
if (isOrdinal && number % 10 == 0) | ||
return numberString + OrdinalTensMap[number / 10]; | ||
|
||
numberString += WholeTensExceptions.TryGetValue(number, out var value) ? value : TensMap[number / 10]; | ||
number %= 10; | ||
} | ||
|
||
if (isOrdinal && !isPrefix) | ||
numberString += GetOrdinalOnes(number, originalLessThanTen); | ||
else | ||
numberString += isPrefix && number == 2 ? "két" : UnitsMap[number]; | ||
|
||
return numberString; | ||
} | ||
|
||
private static string GetOrdinalOnes(long number, bool lessThanTen) | ||
{ | ||
if (lessThanTen) | ||
return OrdinalUnitsMap[number]; | ||
|
||
return OrdinalUnitsExceptions.TryGetValue(number, out var value) ? value : OrdinalUnitsMap[number]; | ||
} | ||
|
||
public override string ConvertToTuple(int number) => | ||
number switch | ||
{ | ||
1 => "szimpla", | ||
2 => "dupla", | ||
3 => "tripla", | ||
4 => "kvadrupla", | ||
5 => "pentapla", | ||
6 => "hexapla", | ||
7 => "heptapla", | ||
8 => "octapla", | ||
9 => "nonapla", | ||
10 => "dekapla", | ||
100 => "hektapla", | ||
1000 => "kiliapla", | ||
_ => $"{number}" | ||
}; | ||
} |
7 changes: 7 additions & 0 deletions
7
src/Humanizer/Localisation/Ordinalizers/HungarianOrdinalizer.cs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,7 @@ | ||
namespace Humanizer; | ||
|
||
class HungarianOrdinalizer : DefaultOrdinalizer | ||
{ | ||
// In hungarian language ordinal numbers are marked with a dot "." at the end | ||
public override string Convert(int number, string numberString) => numberString + "."; | ||
} |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
can you explain this change.
egy év
seems correctThere was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Hello,
This is because I have addedd the missing hungarian translations to the resource file.
egy év
is correct, whentoWords
is set totrue
, othervise the number will be number, not word (1
vsegy
).I created new test cases to verify the word representation of TimeSpans.
https://github.com/Humanizr/Humanizer/pull/1501/files#diff-6829957358e12fc8868dd8833601a3630bc4d27a0489053daa4d863c2459dc7dR612