diff --git a/api/src/com/todoroo/andlib/utility/DateUtilities.java b/api/src/com/todoroo/andlib/utility/DateUtilities.java index 421fc7fa6..a0f2d256e 100644 --- a/api/src/com/todoroo/andlib/utility/DateUtilities.java +++ b/api/src/com/todoroo/andlib/utility/DateUtilities.java @@ -147,16 +147,16 @@ public class DateUtilities { long input = clearTime(new Date(date)); if(today == input) - return context.getString(R.string.today); + return context.getString(R.string.today).toLowerCase(); if(today + ONE_DAY == input) - return context.getString(R.string.yesterday); + return context.getString(R.string.yesterday).toLowerCase(); if(today == input + ONE_DAY) - return context.getString(R.string.tomorrow); + return context.getString(R.string.tomorrow).toLowerCase(); - if(today + DateUtilities.ONE_WEEK <= input && - today - DateUtilities.ONE_WEEK >= input) + if(today + DateUtilities.ONE_WEEK >= input && + today - DateUtilities.ONE_WEEK <= input) return DateUtilities.getWeekday(new Date(date)); return DateUtilities.getDateString(context, new Date(date)); diff --git a/astrid/plugin-src/com/todoroo/astrid/producteev/ProducteevControlSet.java b/astrid/plugin-src/com/todoroo/astrid/producteev/ProducteevControlSet.java index 6c4ac4ca3..295690ddf 100644 --- a/astrid/plugin-src/com/todoroo/astrid/producteev/ProducteevControlSet.java +++ b/astrid/plugin-src/com/todoroo/astrid/producteev/ProducteevControlSet.java @@ -114,7 +114,7 @@ public class ProducteevControlSet implements TaskEditControlSet { DialogUtilities.okDialog(context, context.getString(R.string.DLG_error, e.getMessage()), null); - errorReporter.handleError("pdv-create-dashboard", e); + errorReporter.handleError("pdv-create-dashboard", e); //$NON-NLS-1$ dashSelector.setSelection(0); } } diff --git a/astrid/rmilk-src/org/weloveastrid/rmilk/sync/MilkSyncProvider.java b/astrid/rmilk-src/org/weloveastrid/rmilk/sync/MilkSyncProvider.java index f1bdf7b87..098369dae 100644 --- a/astrid/rmilk-src/org/weloveastrid/rmilk/sync/MilkSyncProvider.java +++ b/astrid/rmilk-src/org/weloveastrid/rmilk/sync/MilkSyncProvider.java @@ -479,7 +479,7 @@ public class MilkSyncProvider extends SyncProvider { task.setValue(Task.DELETION_DATE, DateUtilities.dateToUnixtime(rtmTask.getDeleted())); if(rtmTask.getDue() != null) { task.setValue(Task.DUE_DATE, - task.createDueDate(rtmTask.getHasDueTime() ? Task.URGENCY_SPECIFIC_DAY_TIME : + Task.createDueDate(rtmTask.getHasDueTime() ? Task.URGENCY_SPECIFIC_DAY_TIME : Task.URGENCY_SPECIFIC_DAY, DateUtilities.dateToUnixtime(rtmTask.getDue()))); } else { task.setValue(Task.DUE_DATE, 0L); diff --git a/astrid/src/com/todoroo/astrid/adapter/TaskAdapter.java b/astrid/src/com/todoroo/astrid/adapter/TaskAdapter.java index 6d2cc2d2f..e10e99ddc 100644 --- a/astrid/src/com/todoroo/astrid/adapter/TaskAdapter.java +++ b/astrid/src/com/todoroo/astrid/adapter/TaskAdapter.java @@ -491,7 +491,7 @@ public class TaskAdapter extends CursorAdapter implements Filterable { if(dateCache.containsKey(date)) return dateCache.get(date); - String string = DateUtilities.getRelativeDay(activity, date).toLowerCase(); + String string = DateUtilities.getRelativeDay(activity, date); if(Task.hasDueTime(date)) string = String.format("%s, %s", string, //$NON-NLS-1$ DateUtilities.getTimeString(activity, new Date(date))); diff --git a/astrid/src/com/todoroo/astrid/ui/PeopleContainer.java b/astrid/src/com/todoroo/astrid/ui/PeopleContainer.java index a70f693f0..cae5ffb6e 100644 --- a/astrid/src/com/todoroo/astrid/ui/PeopleContainer.java +++ b/astrid/src/com/todoroo/astrid/ui/PeopleContainer.java @@ -55,7 +55,6 @@ public class PeopleContainer extends LinearLayout { /** Adds a tag to the tag field */ public TextView addPerson(String person) { - System.err.println("ADD PERSON: " + person); LayoutInflater inflater = (LayoutInflater) getContext().getSystemService(Context.LAYOUT_INFLATER_SERVICE); // check if already exists