瀏覽代碼

Merge pull request #2277 from nextcloud/feature/2265/i18n-singular-and-plural

Use singular and plural for vote(s) string
Tim Krüger 2 年之前
父節點
當前提交
a906e2c244

+ 3 - 2
app/src/main/java/com/nextcloud/talk/polls/ui/PollMainDialogFragment.kt

@@ -136,8 +136,9 @@ class PollMainDialogFragment : DialogFragment() {
     private fun initVotersAmount(showVotersAmount: Boolean, numVoters: Int, showResultSubtitle: Boolean) {
         if (showVotersAmount) {
             binding.pollVotesAmount.visibility = View.VISIBLE
-            binding.pollVotesAmount.text = String.format(
-                resources.getString(R.string.polls_amount_voters),
+            binding.pollVotesAmount.text = resources.getQuantityString(
+                R.plurals.polls_amount_voters,
+                numVoters,
                 numVoters
             )
         } else {

+ 4 - 1
app/src/main/res/values/strings.xml

@@ -533,7 +533,10 @@
 
     <!-- Polls -->
     <string name="message_poll_tap_to_open">Tap to open poll</string>
-    <string name="polls_amount_voters">%1$s votes</string>
+    <plurals name="polls_amount_voters">
+        <item quantity="one">%d vote</item>
+        <item quantity="other">%d votes</item>
+    </plurals>
     <string name="polls_add_option">Add option</string>
     <string name="polls_edit_vote">Edit vote</string>
     <string name="polls_submit_vote">Vote</string>