diff --git a/astrid/res/values/strings-repeat.xml b/astrid/res/values/strings-repeat.xml index 625822c00..efd9176d0 100644 --- a/astrid/res/values/strings-repeat.xml +++ b/astrid/res/values/strings-repeat.xml @@ -62,8 +62,12 @@ Rescheduling task \"%s\" + %1$s I\'ve rescheduled this repeating task from %2$s to %3$s + + %1$s I\'ve rescheduled this repeating task to %2$s + diff --git a/astrid/src/com/todoroo/astrid/ui/DateChangedAlerts.java b/astrid/src/com/todoroo/astrid/ui/DateChangedAlerts.java index e59090f07..11c26c85f 100644 --- a/astrid/src/com/todoroo/astrid/ui/DateChangedAlerts.java +++ b/astrid/src/com/todoroo/astrid/ui/DateChangedAlerts.java @@ -130,7 +130,12 @@ public class DateChangedAlerts { String newDueDateString = getRelativeDateAndTimeString(activity, newDueDate); String[] encouragements = activity.getResources().getStringArray(R.array.repeat_encouragement); String encouragement = encouragements[(int) (Math.random()*encouragements.length)]; - String speechBubbleText = activity.getString(R.string.repeat_rescheduling_dialog_bubble, encouragement, oldDueDateString, newDueDateString); + + String speechBubbleText; + if (!TextUtils.isEmpty(oldDueDateString)) + speechBubbleText = activity.getString(R.string.repeat_rescheduling_dialog_bubble, encouragement, oldDueDateString, newDueDateString); + else + speechBubbleText = activity.getString(R.string.repeat_rescheduling_dialog_bubble_no_date, encouragement, newDueDateString); ((TextView) d.findViewById(R.id.reminder_message)).setText(speechBubbleText);