fix: simplify Persian week labels
This commit is contained in:
@@ -148,7 +148,7 @@ func completePeriods(datasetStart, datasetMax time.Time, location *time.Location
|
||||
}
|
||||
for weekStart := weekEnd.AddDate(0, 0, -7); !weekStart.Before(datasetStartDay); weekStart = weekStart.AddDate(0, 0, -7) {
|
||||
weekEnd = weekStart.AddDate(0, 0, 7)
|
||||
weekStartJY, weekStartJM, weekStartJD := gregorianToJalali(weekStart.Year(), int(weekStart.Month()), weekStart.Day())
|
||||
_, weekStartJM, weekStartJD := gregorianToJalali(weekStart.Year(), int(weekStart.Month()), weekStart.Day())
|
||||
weekLastDay := weekEnd.AddDate(0, 0, -1)
|
||||
weekEndJY, weekEndJM, weekEndJD := gregorianToJalali(weekLastDay.Year(), int(weekLastDay.Month()), weekLastDay.Day())
|
||||
periods = append(periods, newPeriod(
|
||||
@@ -157,8 +157,8 @@ func completePeriods(datasetStart, datasetMax time.Time, location *time.Location
|
||||
weekStart,
|
||||
weekEnd,
|
||||
fmt.Sprintf(
|
||||
"هفته %s %s %s تا %s %s %s",
|
||||
persianNumber(weekStartJD), jalaliMonthNames[weekStartJM-1], persianNumber(weekStartJY),
|
||||
"هفته %s %s تا %s %s %s",
|
||||
persianNumber(weekStartJD), jalaliMonthNames[weekStartJM-1],
|
||||
persianNumber(weekEndJD), jalaliMonthNames[weekEndJM-1], persianNumber(weekEndJY),
|
||||
),
|
||||
false,
|
||||
|
||||
Reference in New Issue
Block a user