diff --git a/core/src/main/java/com/nextcloud/android/common/core/utils/DateFormatter.kt b/core/src/main/java/com/nextcloud/android/common/core/utils/DateFormatter.kt index b6ce886e..2872de77 100644 --- a/core/src/main/java/com/nextcloud/android/common/core/utils/DateFormatter.kt +++ b/core/src/main/java/com/nextcloud/android/common/core/utils/DateFormatter.kt @@ -60,10 +60,12 @@ class DateFormatter(private val context: Context) { // less than 1h span < ONE_HOUR_IN_MILLIS -> { + val minutes: Int = span.toInt() / ONE_MINUTE_IN_MILLIS context.resources .getQuantityString( R.plurals.date_formatting_relative_minutes, - span.toInt() / ONE_MINUTE_IN_MILLIS + minutes, + minutes ) } diff --git a/core/src/test/java/com/nextcloud/android/common/core/utils/DateFormatterTest.kt b/core/src/test/java/com/nextcloud/android/common/core/utils/DateFormatterTest.kt index 7731dfb6..669a4d6e 100644 --- a/core/src/test/java/com/nextcloud/android/common/core/utils/DateFormatterTest.kt +++ b/core/src/test/java/com/nextcloud/android/common/core/utils/DateFormatterTest.kt @@ -53,7 +53,7 @@ class DateFormatterTest { val calendar = Calendar.getInstance() calendar.add(Calendar.MINUTE, -5) val formattedDate = dateFormatter.getConditionallyRelativeFormattedTimeSpan(calendar) - val expected = context.resources.getQuantityString(R.plurals.date_formatting_relative_minutes, 5) + val expected = "5m" assertEquals(expected, formattedDate) } @@ -62,7 +62,7 @@ class DateFormatterTest { val calendar = Calendar.getInstance() calendar.add(Calendar.HOUR, -3) val formattedDate = dateFormatter.getConditionallyRelativeFormattedTimeSpan(calendar) - val expected = context.resources.getQuantityString(R.plurals.date_formatting_relative_hours, 3, 3) + val expected = "3h" assertEquals(expected, formattedDate) }