From f02dd85efe1cd76f63fdd95166043a3f2d74fa0a Mon Sep 17 00:00:00 2001
From: Alex Baker <alex@tasks.org>
Date: Thu, 4 Jan 2018 22:24:56 -0600
Subject: [PATCH] Locale override support for date formats

---
 .../java/com/todoroo/andlib/utility/DateUtilities.java    | 5 ++---
 app/src/main/java/org/tasks/locale/Locale.java            | 8 ++++++++
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/com/todoroo/andlib/utility/DateUtilities.java b/app/src/main/java/com/todoroo/andlib/utility/DateUtilities.java
index 0984d5da1..ef428e3d3 100644
--- a/app/src/main/java/com/todoroo/andlib/utility/DateUtilities.java
+++ b/app/src/main/java/com/todoroo/andlib/utility/DateUtilities.java
@@ -11,10 +11,9 @@ import android.text.format.DateFormat;
 import com.todoroo.astrid.data.Task;
 
 import org.tasks.R;
+import org.tasks.locale.Locale;
 import org.tasks.time.DateTime;
 
-import java.util.Locale;
-
 import static org.tasks.date.DateTimeUtils.newDateTime;
 import static org.tasks.time.DateTimeUtils.currentTimeMillis;
 
@@ -115,7 +114,7 @@ public class DateUtilities {
 
     private static String getDateString(String simpleDateFormat, DateTime date) {
         boolean includeYear = date.getYear() != newDateTime().getYear();
-        String format = getFormat(Locale.getDefault(), simpleDateFormat, includeYear);
+        String format = getFormat(Locale.getInstance(), simpleDateFormat, includeYear);
         return date.toString(format);
     }
 
diff --git a/app/src/main/java/org/tasks/locale/Locale.java b/app/src/main/java/org/tasks/locale/Locale.java
index 5e41c235f..ae244bb7f 100644
--- a/app/src/main/java/org/tasks/locale/Locale.java
+++ b/app/src/main/java/org/tasks/locale/Locale.java
@@ -218,4 +218,12 @@ public class Locale {
             }
         }
     }
+
+    public String getLanguage() {
+        return appLocale.getLanguage();
+    }
+
+    public String getCountry() {
+        return appLocale.getCountry();
+    }
 }