Skip to content

fix: render list in interval #13

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

fix: render list in interval #13

Show file tree
Hide file tree
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
6 changes: 5 additions & 1 deletion cron.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -490,7 +490,11 @@ func getSegmentDescription(expr, allDesc string,
desc = sprintf(getDescriptionFormat(expr), getSingleItemDescription(expr))
} else if strings.Index(expr, "/") > -1 {
segments := strings.Split(expr, "/")
desc = sprintf(getIntervalDescriptionFormat(segments[1]), segments[1])
intervalValue := segments[1]
if strings.Index(intervalValue, ",") > -1 {
intervalValue = strings.Replace(intervalValue, ",", locale.GetString(spaceAnd)+" ", -1)
}
desc = sprintf(getIntervalDescriptionFormat(intervalValue), intervalValue)

// interval contains 'between' piece (i.e. 2-59/3 )
if strings.Index(segments[0], "-") > -1 {
Expand Down
2 changes: 1 addition & 1 deletion locale_en_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ func en_TestCases() []localeTestCase {
{inExpr: "0 00 10 ? * MON-THU,SUN *", outErr: nil, outDesc: "At 10:00 AM, only on Monday through Thursday and Sunday"},
{inExpr: "0 0 0 1,2,3 * WED,FRI", outErr: nil, outDesc: "At 12:00 AM, on day 1, 2, and 3 of the month, and on Wednesday and Friday"},
{inExpr: "0 2,16 1,8,15,22 * 1,2", outErr: nil, outDesc: "At 02:00 AM and 04:00 PM, on day 1, 8, 15, and 22 of the month, and on Monday and Tuesday"},
{inExpr: "0 */4,6 * * * ", outErr: nil, outDesc: "At 0 minutes past the hour, every 4,6 hours"},
{inExpr: "0 */4,6 * * * ", outErr: nil, outDesc: "At 0 minutes past the hour, every 4 and 6 hours"},
{inExpr: "5 30 6,14,16 5 * *", outErr: nil, outDesc: "At 5 seconds past the minute, at 30 minutes past the hour, at 06:00 AM, 02:00 PM, and 04:00 PM, on day 5 of the month"},
{inExpr: "0-20/3 9 * * *", outErr: nil, outDesc: "Every 3 minutes, minutes 0 through 20 past the hour, between 09:00 AM and 09:59 AM"},

Expand Down