Mastodon
/
fedilab-Android-App
mirror of https://codeberg.org/tom79/Fedilab
1
0
Fork 0
Code Issues Releases Wiki Activity

Shorter dates

This commit is contained in:
stom79 2017-12-22 17:56:56 +01:00
parent 05167022ab
commit da0a9bc694
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
app/src/main/java/fr/gouv/etalab/mastodon/helper/Helper.java
View File

@ -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);

4
app/src/main/res/values/strings.xml
View File

@ -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>