Skip to content

fix words #1

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
pzabolotniy wants to merge 1 commit into
base: master
Choose a base branch
from
+7 −7
Open

fix words #1

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
14 changes: 7 additions & 7 deletions years.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ func (t Time) YearString() (year string) {
case y == 1900:
year = "Одна тысяча девятисотый"
case y < 2000 && y >= 1900:
year = "Одна тысяча девятьсот " + lastDecadeYearString(y-1900)
year = "Одна тысяча девятсот " + lastDecadeYearString(y-1900)
Copy link
Copy Markdown
Owner

@ivahaev ivahaev Oct 18, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Без этого изменения всё правильно

case y == 2000:
year = "Двухтысячный"
case y > 2000 && y < 3000:
Expand Down Expand Up @@ -56,11 +56,11 @@ func lastDecadeYearString(y int) (result string) {
case y == 16:
result = "шестнадцатого"
case y == 17:
result = "семьнадцатого"
result = "семнадцатого"
case y == 18:
result = "восемьнадцатого"
result = "восемнадцатого"
case y == 19:
result = "девятьнадцатого"
result = "девятнадцатого"
case y == 20:
result = "двадцатого"
case y == 30:
Expand Down Expand Up @@ -103,11 +103,11 @@ func lastDecadeYearStringInCase(y int) (result string) {
case y == 16:
result = "шестнадцатого"
case y == 17:
result = "семьнадцатого"
result = "семнадцатого"
case y == 18:
result = "восемьнадцатого"
result = "восемнадцатого"
case y == 19:
result = "девятьнадцатого"
result = "девятнадцатого"
case y == 20:
result = "двадцатого"
case y == 30:
Expand Down