From 1eac90e5b153879d9a2a16dba35ba98a87933699 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Wed, 18 Nov 2020 16:07:32 +0100
Subject: [PATCH] Use plurals for proper i18n

---
 .../room/membership/RoomDisplayNameResolver.kt     | 14 ++++++++------
 matrix-sdk-android/src/main/res/values/strings.xml |  9 +++++++--
 2 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/membership/RoomDisplayNameResolver.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/membership/RoomDisplayNameResolver.kt
index c69773fbeb..a7dfcfc96f 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/membership/RoomDisplayNameResolver.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/membership/RoomDisplayNameResolver.kt
@@ -110,25 +110,25 @@ internal class RoomDisplayNameResolver @Inject constructor(
             }
             val otherMembersCount = otherMembersSubset.count()
             name = when (otherMembersCount) {
-                0 -> {
+                0    -> {
                     stringProvider.getString(R.string.room_displayname_empty_room)
                     // TODO (was xx and yyy) ...
                 }
-                1 -> resolveRoomMemberName(otherMembersSubset[0], roomMembers)
-                2 -> {
+                1    -> resolveRoomMemberName(otherMembersSubset[0], roomMembers)
+                2    -> {
                     stringProvider.getString(R.string.room_displayname_two_members,
                             resolveRoomMemberName(otherMembersSubset[0], roomMembers),
                             resolveRoomMemberName(otherMembersSubset[1], roomMembers)
                     )
                 }
-                3 -> {
+                3    -> {
                     stringProvider.getString(R.string.room_displayname_3_members,
                             resolveRoomMemberName(otherMembersSubset[0], roomMembers),
                             resolveRoomMemberName(otherMembersSubset[1], roomMembers),
                             resolveRoomMemberName(otherMembersSubset[2], roomMembers)
                     )
                 }
-                4 -> {
+                4    -> {
                     stringProvider.getString(R.string.room_displayname_4_members,
                             resolveRoomMemberName(otherMembersSubset[0], roomMembers),
                             resolveRoomMemberName(otherMembersSubset[1], roomMembers),
@@ -138,7 +138,9 @@ internal class RoomDisplayNameResolver @Inject constructor(
                 }
                 else -> {
                     val remainingCount = invitedCount + joinedCount - otherMembersCount + 1
-                    stringProvider.getString(R.string.room_displayname_four_and_more_members,
+                    stringProvider.getQuantityString(
+                            R.plurals.room_displayname_four_and_more_members,
+                            remainingCount,
                             resolveRoomMemberName(otherMembersSubset[0], roomMembers),
                             resolveRoomMemberName(otherMembersSubset[1], roomMembers),
                             resolveRoomMemberName(otherMembersSubset[2], roomMembers),
diff --git a/matrix-sdk-android/src/main/res/values/strings.xml b/matrix-sdk-android/src/main/res/values/strings.xml
index 130ad5570c..f77cd3203d 100644
--- a/matrix-sdk-android/src/main/res/values/strings.xml
+++ b/matrix-sdk-android/src/main/res/values/strings.xml
@@ -175,10 +175,15 @@
 
     <!-- The 2 parameters will be members' name -->
     <string name="room_displayname_two_members">%1$s and %2$s</string>
+    <!-- The 3 parameters will be members' name -->
     <string name="room_displayname_3_members">%1$s, %2$s and %3$s</string>
+    <!-- The 4 parameters will be members' name -->
     <string name="room_displayname_4_members">%1$s, %2$s, %3$s and %4$s</string>
-    <string name="room_displayname_four_and_more_members">%1$s, %2$s, %3$s and %4$d others</string>
-
+    <!-- The 3 first parameters will be members' name -->
+    <plurals name="room_displayname_four_and_more_members">
+        <item quantity="one">%1$s, %2$s, %3$s and %4$d other</item>
+        <item quantity="other">%1$s, %2$s, %3$s and %4$d others</item>
+    </plurals>
     <plurals name="room_displayname_three_and_more_members">
         <item quantity="one">%1$s and 1 other</item>
         <item quantity="other">%1$s and %2$d others</item>