Only use date shorcuts six days out

Closes #98
pull/120/head
Alex Baker 10 years ago
parent d594e5b6bf
commit 2b0925471c

@ -23,9 +23,7 @@ import static org.tasks.date.DateTimeUtils.newDate;
public class DateUtilities {
/* ======================================================================
* ============================================================ long time
* ====================================================================== */
private static final long abbreviationLimit = DateUtilities.ONE_DAY * 6;
/**
* Add the specified amount of months to the given time.<br/>
@ -205,7 +203,7 @@ public class DateUtilities {
return context.getString(abbreviated ? R.string.yest : R.string.yesterday).toLowerCase();
}
if(today + DateUtilities.ONE_WEEK >= input && today - DateUtilities.ONE_WEEK <= input) {
if(today + abbreviationLimit >= input && today - abbreviationLimit <= input) {
return abbreviated ? DateUtilities.getWeekdayShort(newDate(date)) : DateUtilities.getWeekday(newDate(date));
}

@ -59,19 +59,19 @@ public class RelativeDayTest {
}
@Test
public void relativeDayOneWeek() {
checkRelativeDay(now().minusDays(7), "Tuesday", "Tue");
checkRelativeDay(now().plusDays(7), "Tuesday", "Tue");
public void relativeDaySix() {
checkRelativeDay(now().minusDays(6), "Wednesday", "Wed");
checkRelativeDay(now().plusDays(6), "Monday", "Mon");
}
@Test
public void relativeDayMoreThanOneWeek() {
checkRelativeDay(now().minusDays(8), "Dec 23", "Dec 23");
public void relativeDayOneWeek() {
checkRelativeDay(now().minusDays(7), "Dec 24", "Dec 24");
}
@Test
public void relativeDayNextYear() {
checkRelativeDay(now().plusDays(8), "Jan 8\n2014", "Jan 8\n2014");
public void relativeDayOneWeekNextYear() {
checkRelativeDay(now().plusDays(7), "Jan 7\n2014", "Jan 7\n2014");
}
private void checkRelativeDay(DateTime now, String full, String abbreviated) {

Loading…
Cancel
Save