Skip to content

Update Num2Word to correctly convert phrases like "24 miles" #11

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

Open
jlund wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Update Num2Word to correctly convert phrases like "24 miles" #11

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
12 changes: 6 additions & 6 deletions Sources/MisakiSwift/English/Num2Word/EnglishNum2Word.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,11 @@ struct EnglishNum2Word {
(1000, "thousand"), (100, "hundred"),
(90, "ninety"), (80, "eighty"), (70, "seventy"),
(60, "sixty"), (50, "fifty"), (40, "forty"),
(30, "thirty")
(30, "thirty"), (20, "twenty")
]

private let lowNumWords = [
"twenty", "nineteen", "eighteen", "seventeen",
"nineteen", "eighteen", "seventeen",
"sixteen", "fifteen", "fourteen", "thirteen",
"twelve", "eleven", "ten", "nine", "eight",
"seven", "six", "five", "four", "three", "two",
Expand Down Expand Up @@ -108,19 +108,19 @@ struct EnglishNum2Word {
return negWord + toCardinal(abs(number))
}

if number < 21 {
return lowNumWords[20 - number]
if number < 20 {
return lowNumWords[19 - number]
}

// Handle numbers from 21-99
// Handle numbers from 20-99
if number < 100 {
let tens = (number / 10) * 10
let ones = number % 10
if ones == 0 {
return midNumWords.first { $0.0 == tens }?.1 ?? ""
} else {
let tensWord = midNumWords.first { $0.0 == tens }?.1 ?? ""
let onesWord = lowNumWords[20 - ones]
let onesWord = lowNumWords[19 - ones]
return "\(tensWord)-\(onesWord)"
}
}
Expand Down