Skip to content

ts-human-format-duration - use singular unit names when values are 1 #12

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
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

ts-human-format-duration - use singular unit names when values are 1 #12

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
79c4492
ts-human-format-duration - use singular unit names when values are 1
May 18, 2020
59f2a0e
ts-human-format-duration - add test cases for singulars and plurals
May 19, 2020
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: 10 additions & 4 deletions test/test.el
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -238,12 +238,18 @@
;;;;; Duration

(ert-deftest ts-human-format-duration ()
(let* ((now (ts-now))
(past (ts-adjust 'day -400 'hour -2 'minute -1 'second -5 now)))
(let* ((now (ts-now))
(past (ts-adjust 'day -400 'hour -2 'minute -1 'second -5 now))
(past-1 (ts-adjust 'day -366 'hour -1 'minute -1 'second -1 now))
(past-2 (ts-adjust 'day (- (+ 2 (* 365 2))) 'hour -2 'minute -2 'second -2 now)))
(should (equal (ts-human-format-duration (ts-difference now past))
"1 years, 35 days, 2 hours, 1 minutes, 5 seconds"))
"1 year, 35 days, 2 hours, 1 minute, 5 seconds"))
(should (equal (ts-human-format-duration (ts-difference now past) 'abbr)
"1y35d2h1m5s"))))
"1y35d2h1m5s"))
(should (equal (ts-human-format-duration (ts-difference now past-1))
"1 year, 1 day, 1 hour, 1 minute, 1 second"))
(should (equal (ts-human-format-duration (ts-difference now past-2))
"2 years, 2 days, 2 hours, 2 minutes, 2 seconds"))))

;;;;; Formatting

Expand Down
4 changes: 3 additions & 1 deletion ts.el
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -465,7 +465,9 @@ leap years, leap seconds, etc."
(if abbreviate "" " ")
(if abbreviate
,(substring (symbol-name place) 0 1)
,(symbol-name place)))))
(if (= ,place 1)
(s-chop-suffix "s" ,(symbol-name place))
,(symbol-name place))))))
(join-places (&rest places)
;; Return string joining the names and values of PLACES.
`(->> (list ,@(cl-loop for place in places
Expand Down