From 0ad2051dd369d7b1910ead6ff78856155b2b6ead Mon Sep 17 00:00:00 2001 From: ericdecanini Date: Wed, 20 Jul 2022 14:48:38 +0200 Subject: [PATCH] Improves plural used in strings --- .../app/features/home/room/list/RoomSummaryItemFactory.kt | 4 ++-- vector/src/main/res/values/strings.xml | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/vector/src/main/java/im/vector/app/features/home/room/list/RoomSummaryItemFactory.kt b/vector/src/main/java/im/vector/app/features/home/room/list/RoomSummaryItemFactory.kt index a78c3d2fdc..85879e6807 100644 --- a/vector/src/main/java/im/vector/app/features/home/room/list/RoomSummaryItemFactory.kt +++ b/vector/src/main/java/im/vector/app/features/home/room/list/RoomSummaryItemFactory.kt @@ -217,8 +217,8 @@ class RoomSummaryItemFactory @Inject constructor( when (val size = directParentNames.size) { 0 -> null 1 -> directParentNames.first() - 2 -> stringProvider.getQuantityString(R.plurals.search_space_parents, 1, directParentNames[0], directParentNames[1]) - else -> stringProvider.getQuantityString(R.plurals.search_space_parents, size - 1, directParentNames[0], directParentNames.size - 1) + 2 -> stringProvider.getString(R.string.search_space_two_parents, directParentNames[0], directParentNames[1]) + else -> stringProvider.getQuantityString(R.plurals.search_space_multiple_parents, size - 1, directParentNames[0], size - 1) } } } diff --git a/vector/src/main/res/values/strings.xml b/vector/src/main/res/values/strings.xml index 5243e1bd20..333a626179 100644 --- a/vector/src/main/res/values/strings.xml +++ b/vector/src/main/res/values/strings.xml @@ -764,8 +764,9 @@ Filter room members Filter banned users No results - - %1$s and %2$s + %1$s and %2$s + + %1$s and %2$d other %1$s and %2$d others