diff --git a/mastodon/src/main/java/org/joinmastodon/android/ui/utils/UiUtils.java b/mastodon/src/main/java/org/joinmastodon/android/ui/utils/UiUtils.java index 05ce5b573..ab0b391ec 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/ui/utils/UiUtils.java +++ b/mastodon/src/main/java/org/joinmastodon/android/ui/utils/UiUtils.java @@ -219,11 +219,20 @@ public class UiUtils { if(diff<1000L){ return context.getString(R.string.time_now); }else if(diff<60_000L){ - return context.getString(ago ? R.string.time_seconds_ago_short : R.string.sk_time_seconds, diff/1000L); + long time = diff/1000L; + return ago ? + context.getString(R.string.time_seconds_ago_short, time) : + context.getResources().getQuantityString(R.plurals.sk_time_seconds, (int) time, time); }else if(diff<3600_000L){ - return context.getString(ago ? R.string.time_minutes_ago_short : R.string.sk_time_minutes, diff/60_000L); + long time = diff/60_000L; + return ago ? + context.getString(R.string.time_minutes_ago_short, time) : + context.getResources().getQuantityString(R.plurals.sk_time_minutes, (int) time, time); }else if(diff<3600_000L*24L){ - return context.getString(ago ? R.string.time_hours_ago_short : R.string.sk_time_hours, diff/3600_000L); + long time = diff/3600_000L; + return ago ? + context.getString(R.string.time_hours_ago_short, time) : + context.getResources().getQuantityString(R.plurals.sk_time_hours, (int) time, time); } else { int days = (int) (diff / (3600_000L * 24L)); if (ago && days > 30) { @@ -234,7 +243,7 @@ public class UiUtils { return DATE_FORMATTER_SHORT_WITH_YEAR.format(dt); } } - return context.getString(ago ? R.string.time_days_ago_short : R.string.sk_time_days, days); + return ago ? context.getString(R.string.time_days_ago_short, days) : context.getResources().getQuantityString(R.plurals.sk_time_days, days, days); } } diff --git a/mastodon/src/main/res/values-de-rDE/strings_sk.xml b/mastodon/src/main/res/values-de-rDE/strings_sk.xml index 8c7cb5da9..ab1de2978 100644 --- a/mastodon/src/main/res/values-de-rDE/strings_sk.xml +++ b/mastodon/src/main/res/values-de-rDE/strings_sk.xml @@ -382,10 +382,6 @@ Beiträge Tab-Bezeichnungen in der Navigationsleiste anzeigen - %d Sekunden - %d Minuten - %d Stunden - %d Tage https://findahelpline.com Ältere Beiträge laden Neuere Beiträge laden diff --git a/mastodon/src/main/res/values-pt-rBR/strings_sk.xml b/mastodon/src/main/res/values-pt-rBR/strings_sk.xml index fc2cbaf1f..244f05b82 100644 --- a/mastodon/src/main/res/values-pt-rBR/strings_sk.xml +++ b/mastodon/src/main/res/values-pt-rBR/strings_sk.xml @@ -370,9 +370,5 @@ Revelar automaticamente Avisos de Conteúdo nas respostas Lixeira de reciclagem Pesquisar - %d minutos - %d horas Suicídio - %d segundos - %d dias \ No newline at end of file diff --git a/mastodon/src/main/res/values/strings_sk.xml b/mastodon/src/main/res/values/strings_sk.xml index 5203e1b73..3b297d259 100644 --- a/mastodon/src/main/res/values/strings_sk.xml +++ b/mastodon/src/main/res/values/strings_sk.xml @@ -388,8 +388,20 @@ Post contains media Load newer posts Load older posts - %d seconds - %d minutes - %d hours - %d days + + %d second + %d seconds + + + %d minute + %d minutes + + + %d hour + %d hours + + + %d day + %d days + \ No newline at end of file