diff --git a/src/androidTest/java/com/todoroo/andlib/utility/RelativeDayTest.java b/src/androidTest/java/com/todoroo/andlib/utility/RelativeDayTest.java index bdfd73ddd..5b9cb12e0 100644 --- a/src/androidTest/java/com/todoroo/andlib/utility/RelativeDayTest.java +++ b/src/androidTest/java/com/todoroo/andlib/utility/RelativeDayTest.java @@ -30,15 +30,15 @@ public class RelativeDayTest extends AndroidTestCase { } public void testRelativeDayIsToday() { - checkRelativeDay(now(), "today", "today"); + checkRelativeDay(now(), "Today", "Today"); } public void testRelativeDayIsTomorrow() { - checkRelativeDay(now().plusDays(1), "tomorrow", "tmrw"); + checkRelativeDay(now().plusDays(1), "Tomorrow", "Tmrw"); } public void testRelativeDayIsYesterday() { - checkRelativeDay(now().minusDays(1), "yesterday", "yest"); + checkRelativeDay(now().minusDays(1), "Yesterday", "Yest"); } public void testRelativeDayTwo() { @@ -61,6 +61,6 @@ public class RelativeDayTest extends AndroidTestCase { private void checkRelativeDay(DateTime now, String full, String abbreviated) { assertEquals(full, getRelativeDay(getContext(), now.getMillis(), false)); - assertEquals(abbreviated, getRelativeDay(getContext(), now.getMillis())); + assertEquals(abbreviated, getRelativeDay(getContext(), now.getMillis(), true)); } } diff --git a/src/main/java/com/todoroo/andlib/utility/DateUtilities.java b/src/main/java/com/todoroo/andlib/utility/DateUtilities.java index 70a01b86b..8c19bfd7e 100644 --- a/src/main/java/com/todoroo/andlib/utility/DateUtilities.java +++ b/src/main/java/com/todoroo/andlib/utility/DateUtilities.java @@ -196,10 +196,6 @@ public class DateUtilities { return getDateString(date) + " " + getTimeString(context, date); } - public static String getRelativeDay(Context context, long date) { - return DateUtilities.getRelativeDay(context, date, true); - } - /** * @return yesterday, today, tomorrow, or null */ @@ -208,15 +204,15 @@ public class DateUtilities { long input = clearTime(newDate(date)); if(today == input) { - return context.getString(R.string.today).toLowerCase(); + return context.getString(R.string.today); } if(today + ONE_DAY == input) { - return context.getString(abbreviated ? R.string.tmrw : R.string.tomorrow).toLowerCase(); + return context.getString(abbreviated ? R.string.tmrw : R.string.tomorrow); } if(today == input + ONE_DAY) { - return context.getString(abbreviated ? R.string.yest : R.string.yesterday).toLowerCase(); + return context.getString(abbreviated ? R.string.yest : R.string.yesterday); } if(today + abbreviationLimit >= input && today - abbreviationLimit <= input) { diff --git a/src/main/java/com/todoroo/astrid/adapter/TaskAdapter.java b/src/main/java/com/todoroo/astrid/adapter/TaskAdapter.java index cacda0d9b..366b9d0fc 100644 --- a/src/main/java/com/todoroo/astrid/adapter/TaskAdapter.java +++ b/src/main/java/com/todoroo/astrid/adapter/TaskAdapter.java @@ -499,7 +499,7 @@ public class TaskAdapter extends CursorAdapter implements Filterable { } String formatString = "%s %s"; - String string = DateUtilities.getRelativeDay(fragment.getActivity(), date); + String string = DateUtilities.getRelativeDay(fragment.getActivity(), date, true); if(Task.hasDueTime(date)) { string = String.format(formatString, string, //$NON-NLS-1$ DateUtilities.getTimeString(fragment.getActivity(), newDate(date))); diff --git a/src/main/java/org/tasks/widget/DueDateFormatter.java b/src/main/java/org/tasks/widget/DueDateFormatter.java index 552edd69a..f9f56b87e 100644 --- a/src/main/java/org/tasks/widget/DueDateFormatter.java +++ b/src/main/java/org/tasks/widget/DueDateFormatter.java @@ -48,7 +48,7 @@ public class DueDateFormatter { } String formatString = "%s %s"; - String string = DateUtilities.getRelativeDay(context, date); + String string = DateUtilities.getRelativeDay(context, date, false); if (Task.hasDueTime(date)) { string = String.format(formatString, string, //$NON-NLS-1$ DateUtilities.getTimeString(context, newDate(date)));