Fix relative times

They now use the proper singular form, and the larger differences have
been fixed as well.

quit.go

@@ -381,23 +381,42 @@ type FancyTime struct {
}
func (fc FancyTime) PrettyString() string {
	makeForm := func(c int, singular, plural string) string {
		form := plural
		if c == 1 {
			form = singular
		}
		return fmt.Sprintf("%d %s ago", c, form)
	}
	now := time.Now()
	diff := time.Since(fc.Time)
	switch {
	case diff < time.Minute:
		return fmt.Sprintf("%d seconds ago", diff/time.Second)
		return makeForm(int(diff/time.Second), "second", "seconds")
	case diff < time.Hour:
		return fmt.Sprintf("%d minutes ago", diff/time.Minute)
		return makeForm(int(diff/time.Minute), "minute", "minutes")
	case now.AddDate(0, 0, -1).Before(fc.Time):
		return fmt.Sprintf("%d hours ago", diff/time.Hour)
		return makeForm(int(diff/time.Hour), "hour", "hours")
	case now.AddDate(0, 0, -7).Before(fc.Time):
		return fmt.Sprintf("%d days ago", diff/(24*time.Hour))
		d := now.Day() - fc.Time.Day()
		if d <= 0 {
			d += 30
		}
		return makeForm(d, "day", "days")
	case now.AddDate(0, -1, 0).Before(fc.Time):
		return fmt.Sprintf("%d weeks ago", diff/(7*24*time.Hour))
		d := now.Day() - fc.Time.Day()
		if d <= 0 {
			d += 30
		}
		return makeForm(d/7, "week", "weeks")
	case now.AddDate(-1, 0, 0).Before(fc.Time):
		return fmt.Sprintf("%d months ago", diff/(30*7*24*time.Hour))
		m := now.Month() - fc.Time.Month()
		if m <= 0 {
			m += 12
		}
		return makeForm(int(m), "month", "months")
	default:
		return fmt.Sprintf("%d years ago", diff/(365*7*24*time.Hour))
		return makeForm(now.Year()-fc.Time.Year(), "year", "years")
	}
}