From da0a9bc69405e3f27c1893b458692ab8684daf9b Mon Sep 17 00:00:00 2001
From: stom79 <tschneider.ac@gmail.com>
Date: Fri, 22 Dec 2017 17:56:56 +0100
Subject: [PATCH] Shorter dates

---
 .../java/fr/gouv/etalab/mastodon/helper/Helper.java  | 12 +++++++-----
 app/src/main/res/values/strings.xml                  |  4 +---
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/helper/Helper.java b/app/src/main/java/fr/gouv/etalab/mastodon/helper/Helper.java
index 4f8c66b7d..e4f1430dd 100644
--- a/app/src/main/java/fr/gouv/etalab/mastodon/helper/Helper.java
+++ b/app/src/main/java/fr/gouv/etalab/mastodon/helper/Helper.java
@@ -574,11 +574,13 @@ public class Helper {
         long months = days / 30;
         long years = days / 365;
 
-        if( years > 0)
-            return context.getResources().getString(R.string.date_year, (int)years);
-        else if( months > 0)
-            return context.getResources().getString(R.string.date_month, (int)months);
-        else if( days > 0)
+        if( years > 0 ) {
+            SimpleDateFormat format = new SimpleDateFormat("M/d/yy", Locale.getDefault());
+            return format.format(dateToot);
+        } else if( months > 0 || days > 7) {
+            SimpleDateFormat format = new SimpleDateFormat("M/d", Locale.getDefault());
+            return format.format(dateToot);
+        }else if( days > 0 )
             return context.getString(R.string.date_day, days);
         else if(hours > 0)
             return context.getResources().getString(R.string.date_hours, (int)hours);
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index b174d789c..8ded1b8f5 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -138,11 +138,9 @@
     </plurals>
     <!-- Date -->
     <string name="date_seconds">%d s</string>
-    <string name="date_minutes">%d min</string>
+    <string name="date_minutes">%d m</string>
     <string name="date_hours">%d h</string>
     <string name="date_day">%d d</string>
-    <string name="date_month">%d m</string>
-    <string name="date_year">%d y</string>
 
     <!-- TOOT -->
     <string name="toot_cw_placeholder">Warning</string>