Better date format localization

4 files changed, 27 insertions, 19 deletions

diff --git a/app/src/main/java/com/camilstaps/common/Date.java b/app/src/main/java/com/camilstaps/common/Date.java
index 2823e35..3804aaf 100644
--- a/app/src/main/java/com/camilstaps/common/Date.java
+++ b/app/src/main/java/com/camilstaps/common/Date.java
@@ -1,9 +1,13 @@
 package com.camilstaps.common;
 
+import android.content.Context;
 import android.util.Log;
 
+import com.camilstaps.taize.R;
+
 import java.text.ParseException;
 import java.util.Calendar;
+import java.util.GregorianCalendar;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
@@ -162,23 +166,7 @@ public class Date implements Comparable<Date> {
         return 0;
     }
 
-    public int getDayOfWeek() {
-        // See: http://en.wikipedia.org/wiki/Determination_of_the_day_of_the_week#A_tabular_method_to_calculate_the_day_of_the_week
-        int months[] = {isLeapYear() ? 6 : 0, isLeapYear() ? 2 : 3, 3, 6, 1, 4, 6, 2, 5, 0, 3, 5};
-        return (day + months[month - 1] + (year % 100) + (int) Math.floor((year % 100) / 4) + 2 * (3 - ((int) Math.floor(year / 100) % 4))) % 7;
-    }
-
-    public String getDayOfWeekName() {
-        String days[] = {"Sunday","Monday","Tuesday","Wednesday","Thursday","Friday","Saturday"};
-        return days[getDayOfWeek()];
-    }
-
-    public String getMonthName() {
-        String months[] = {"January","February","March","April","May","June","July","August","September","October","November","December"};
-        return months[month - 1];
-    }
-
-    public String toNiceString() {
-        return getDayOfWeekName() + ", " + day + " " + getMonthName() + " " + year;
+    public String toNiceString(Context context) {
+        return android.text.format.DateFormat.getDateFormat(context).format(new GregorianCalendar(year, month - 1, day).getTime());
     }
 }
diff --git a/app/src/main/java/com/camilstaps/taize/MainActivity.java b/app/src/main/java/com/camilstaps/taize/MainActivity.java
index 505674a..19c5fb6 100644
--- a/app/src/main/java/com/camilstaps/taize/MainActivity.java
+++ b/app/src/main/java/com/camilstaps/taize/MainActivity.java
@@ -102,7 +102,7 @@ public class MainActivity extends ActionBarActivity
             }
         }, date);
 
-        ((TextView) findViewById(R.id.dateDailyReading)).setText(date.toNiceString());
+        ((TextView) findViewById(R.id.dateDailyReading)).setText(date.toNiceString(this));
     }
 
     private void setDailyReadingBibleText() {
diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml
index e77613d..e9517de 100644
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@@ -11,4 +11,14 @@
     <string name="action_example">Update</string>
 
     <string name="action_settings">Instellingen</string>
+
+    <string-array name="weekdays">
+        <item>Zondag</item>
+        <item>Maandag</item>
+        <item>Dinsdag</item>
+        <item>Woensdag</item>
+        <item>Donderdag</item>
+        <item>Vrijdag</item>
+        <item>Zaterdag</item>
+    </string-array>
 </resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 32383f1..cc0dd22 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -10,4 +10,14 @@
     <string name="action_example">Update</string>
 
     <string name="action_settings">Settings</string>
+
+    <string-array name="weekdays">
+        <item>Sunday</item>
+        <item>Monday</item>
+        <item>Tuesday</item>
+        <item>Wednesday</item>
+        <item>Thursday</item>
+        <item>Friday</item>
+        <item>Saturday</item>
+    </string-array>
 </resources>