Skip to content

FIX GRAMMATICAL ERROR #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
aidenwallis wants to merge 3 commits into
base: master
Choose a base branch
from
Open

FIX GRAMMATICAL ERROR #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
609ac50
FIX GRAMMATICAL ERROR
aidenwallis Aug 30, 2021
b56641a
Update time.go
aidenwallis Oct 2, 2021
1d11855
sike thats the wrong number! get it because it's about numbers haha i…
aidenwallis Oct 2, 2021
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
2 changes: 1 addition & 1 deletion time.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ func CustomDurationString(diff time.Duration, numParts int, glue string) string
}
if value > 0 {
part := fmt.Sprintf("%d %s", value, mag.Name)
if value > 1 {
if !(value == 1 || value == -1) {
part += "s"
}

Expand Down
4 changes: 4 additions & 0 deletions time_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,10 @@ func TestCustomRelTime(t *testing.T) {
t2, _ = time.Parse(timeFormat, "Mon Jan 3 15:00:02.000")
testCustomRelTime(t, t1, t2, 3, " ", "4 minutes 3 seconds")

t1, _ = time.Parse(timeFormat, "Mon Jan 3 15:04:05.000")
t2, _ = time.Parse(timeFormat, "Mon Jan 3 15:00:04.000")
testCustomRelTime(t, t1, t2, 3, " ", "4 minutes 1 second")

t1, _ = time.Parse(timeFormat, "Mon Jan 3 15:04:05.000")
t2, _ = time.Parse(timeFormat, "Mon Jan 3 15:00:02.001")
testCustomRelTime(t, t1, t2, 3, " ", "4 minutes 2 seconds")
Expand Down