From 953f34f5e3657f1f8984a56694a2846fd671ffe0 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Wed, 19 Jan 2022 21:39:09 +0100
Subject: [PATCH] Fix an error in string resource (#4997)

---
 changelog.d/4997.bugfix                                     | 1 +
 .../home/room/detail/timeline/factory/MessageItemFactory.kt | 6 +++++-
 vector/src/main/res/values/strings.xml                      | 2 +-
 3 files changed, 7 insertions(+), 2 deletions(-)
 create mode 100644 changelog.d/4997.bugfix

diff --git a/changelog.d/4997.bugfix b/changelog.d/4997.bugfix
new file mode 100644
index 0000000000..0bdfbede25
--- /dev/null
+++ b/changelog.d/4997.bugfix
@@ -0,0 +1 @@
+Fix an error in string resource
\ No newline at end of file
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/MessageItemFactory.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/MessageItemFactory.kt
index ec0c247a03..56a2910d10 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/MessageItemFactory.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/MessageItemFactory.kt
@@ -190,7 +190,11 @@ class MessageItemFactory @Inject constructor(
             when {
                 isEnded      -> stringProvider.getQuantityString(R.plurals.poll_total_vote_count_after_ended, it, it)
                 didUserVoted -> stringProvider.getQuantityString(R.plurals.poll_total_vote_count_before_ended_and_voted, it, it)
-                else         -> stringProvider.getQuantityString(R.plurals.poll_total_vote_count_before_ended_and_not_voted, it, it)
+                else         -> if (it == 0) {
+                    stringProvider.getString(R.string.poll_no_votes_cast)
+                } else {
+                    stringProvider.getQuantityString(R.plurals.poll_total_vote_count_before_ended_and_not_voted, it, it)
+                }
             }
         }
 
diff --git a/vector/src/main/res/values/strings.xml b/vector/src/main/res/values/strings.xml
index 110d1e651b..7d8d24e47b 100644
--- a/vector/src/main/res/values/strings.xml
+++ b/vector/src/main/res/values/strings.xml
@@ -3693,8 +3693,8 @@
         <item quantity="one">Based on %1$d vote</item>
         <item quantity="other">Based on %1$d votes</item>
     </plurals>
+    <string name="poll_no_votes_cast">No votes cast</string>
     <plurals name="poll_total_vote_count_before_ended_and_not_voted">
-        <item quantity="zero">No votes cast</item>
         <item quantity="one">%1$d vote cast. Vote to the see the results</item>
         <item quantity="other">%1$d votes cast. Vote to the see the results</item>
     </plurals>