From ece12e8aefd76a24b58368c60e65ec4a1156bc94 Mon Sep 17 00:00:00 2001
From: Sam Bosley <sboz88@gmail.com>
Date: Thu, 16 Aug 2012 14:54:41 -0700
Subject: [PATCH] Update capitalization of date picker strings

---
 astrid/res/values/strings-core.xml                      | 8 ++++----
 astrid/res/values/strings-repeat.xml                    | 2 +-
 astrid/src/com/todoroo/astrid/ui/AstridTimePicker.java  | 6 +++---
 astrid/src/com/todoroo/astrid/ui/DateAndTimePicker.java | 2 +-
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/astrid/res/values/strings-core.xml b/astrid/res/values/strings-core.xml
index 616ac90f6..187eb8201 100644
--- a/astrid/res/values/strings-core.xml
+++ b/astrid/res/values/strings-core.xml
@@ -400,13 +400,13 @@
   <string-array name="TEA_urgency">
       <!-- slide 19: urgency: labels for edit page. item #4 -> auto filled -->
       <item>No deadline</item>
-      <item>Specific Day</item>
+      <item>Specific day</item>
       <item>Today</item>
       <item>Tomorrow</item>
       <item>(day after)</item>
-      <item>Next Week</item>
-      <item>In Two Weeks</item>
-      <item>Next Month</item>
+      <item>Next week</item>
+      <item>In two weeks</item>
+      <item>Next month</item>
   </string-array>
   
   <string name="TEA_no_time">No time</string>
diff --git a/astrid/res/values/strings-repeat.xml b/astrid/res/values/strings-repeat.xml
index 5dfdf9956..400b14948 100644
--- a/astrid/res/values/strings-repeat.xml
+++ b/astrid/res/values/strings-repeat.xml
@@ -24,7 +24,7 @@
   <string name="repeat_interval_prompt">Repeat Interval</string>
   
   <!-- slide 19b-->
-  <string name="repeat_never">Make Repeating?</string>
+  <string name="repeat_never">Make repeating?</string>
   <!-- slide 20f-->
   <string name="repeat_dont">Don\'t repeat</string>
       
diff --git a/astrid/src/com/todoroo/astrid/ui/AstridTimePicker.java b/astrid/src/com/todoroo/astrid/ui/AstridTimePicker.java
index 47290a882..38c50d261 100644
--- a/astrid/src/com/todoroo/astrid/ui/AstridTimePicker.java
+++ b/astrid/src/com/todoroo/astrid/ui/AstridTimePicker.java
@@ -108,12 +108,12 @@ public class AstridTimePicker extends LinearLayout {
         hours.findViewById(R.id.timepicker_left_border).setVisibility(View.VISIBLE);
         minutes.findViewById(R.id.timepicker_right_border).setVisibility(View.VISIBLE);
 
-        String amString = DateUtils.getAMPMString(Calendar.AM).toLowerCase();
+        String amString = DateUtils.getAMPMString(Calendar.AM).toUpperCase();
         amButton.setTextOff(amString);
         amButton.setTextOn(amString);
         amButton.setChecked(false);
 
-        String pmString = DateUtils.getAMPMString(Calendar.PM).toLowerCase();
+        String pmString = DateUtils.getAMPMString(Calendar.PM).toUpperCase();
         pmButton.setTextOff(pmString);
         pmButton.setTextOn(pmString);
         pmButton.setChecked(false);
@@ -138,7 +138,7 @@ public class AstridTimePicker extends LinearLayout {
             }
         });
 
-        String noTime = context.getString(R.string.TEA_no_time).toLowerCase();
+        String noTime = context.getString(R.string.TEA_no_time);
         noTimeCheck.setTextOff(noTime);
         noTimeCheck.setTextOn(noTime);
 
diff --git a/astrid/src/com/todoroo/astrid/ui/DateAndTimePicker.java b/astrid/src/com/todoroo/astrid/ui/DateAndTimePicker.java
index dbe745e2f..458dbdfbe 100644
--- a/astrid/src/com/todoroo/astrid/ui/DateAndTimePicker.java
+++ b/astrid/src/com/todoroo/astrid/ui/DateAndTimePicker.java
@@ -165,7 +165,7 @@ public class DateAndTimePicker extends LinearLayout {
             UrgencyValue uv = urgencyValues.get(i);
 
             ToggleButton tb = new ToggleButton(context);
-            String label = uv.label.toLowerCase();
+            String label = uv.label;
             tb.setTextOff(label);
             tb.setTextOn(label);
             tb.setTag(uv);