From 778645e7588f1819418ecdebf314c3f4fa44ca08 Mon Sep 17 00:00:00 2001 From: stom79 Date: Mon, 8 Jan 2018 18:43:59 +0100 Subject: [PATCH] Fixes issue #234 - Truncated dates --- app/src/main/java/fr/gouv/etalab/mastodon/helper/Helper.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) 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 91c8fbfea..d3e6e5038 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 @@ -587,7 +587,10 @@ public class Helper { if( years > 0 ) { return format; } else if( months > 0 || days > 7) { - return format.substring(0,5); + //Removes the year depending of the locale from DateFormat.SHORT format + SimpleDateFormat df = (SimpleDateFormat) DateFormat.getDateInstance(DateFormat.SHORT, Locale.getDefault()); + df.applyPattern(df.toPattern().replaceAll("[^\\p{Alpha}]*y+[^\\p{Alpha}]*", "")); + return df.format(dateToot); }else if( days > 0 ) return context.getString(R.string.date_day, days); else if(hours > 0)