From 0ae4d1369db80883d6bf53a0b3d025e15f31e4cb Mon Sep 17 00:00:00 2001
From: bopol <bopol@e.email>
Date: Sun, 15 Mar 2020 07:25:48 -0300
Subject: [PATCH] use plural string for feed_group_dialog_selection_count

---
 .../schabi/newpipe/local/feed/FeedFragment.kt |  2 +-
 .../subscription/dialog/FeedGroupDialog.kt    |  6 ++-
 app/src/main/res/values-eo/strings.xml        | 40 +++++++++++++++++++
 app/src/main/res/values-fr/strings.xml        |  8 ++--
 app/src/main/res/values/strings.xml           |  5 ++-
 5 files changed, 54 insertions(+), 7 deletions(-)

diff --git a/app/src/main/java/org/schabi/newpipe/local/feed/FeedFragment.kt b/app/src/main/java/org/schabi/newpipe/local/feed/FeedFragment.kt
index 64020d14c..d41a2e37b 100644
--- a/app/src/main/java/org/schabi/newpipe/local/feed/FeedFragment.kt
+++ b/app/src/main/java/org/schabi/newpipe/local/feed/FeedFragment.kt
@@ -128,7 +128,7 @@ class FeedFragment : BaseListFragment<FeedState, Unit>() {
                                 .putBoolean(getString(R.string.feed_use_dedicated_fetch_method_key), !usingDedicatedMethod)
                                 .apply()
                     }
-                    .setPositiveButton(android.R.string.ok, null)
+                    .setPositiveButton(resources.getString(R.string.finish), null)
                     .create()
                     .show()
             return true
diff --git a/app/src/main/java/org/schabi/newpipe/local/subscription/dialog/FeedGroupDialog.kt b/app/src/main/java/org/schabi/newpipe/local/subscription/dialog/FeedGroupDialog.kt
index 27ff38a3f..eecbf515d 100644
--- a/app/src/main/java/org/schabi/newpipe/local/subscription/dialog/FeedGroupDialog.kt
+++ b/app/src/main/java/org/schabi/newpipe/local/subscription/dialog/FeedGroupDialog.kt
@@ -189,7 +189,8 @@ class FeedGroupDialog : DialogFragment() {
         val groupAdapter = GroupAdapter<GroupieViewHolder>()
         groupAdapter.spanCount = if (useGridLayout) 4 else 1
 
-        val selectedCountText = getString(R.string.feed_group_dialog_selection_count, this.selectedSubscriptions.size)
+        var subscriptionsCount = this.selectedSubscriptions.size
+        val selectedCountText = resources.getQuantityString(R.plurals.feed_group_dialog_selection_count, subscriptionsCount, subscriptionsCount)
         selected_subscription_count_view.text = selectedCountText
         subscriptions_selector_header_info.text = selectedCountText
 
@@ -234,7 +235,8 @@ class FeedGroupDialog : DialogFragment() {
                     item.isSelected = isSelected
                     item.notifyChanged(PickerSubscriptionItem.UPDATE_SELECTED)
 
-                    val updateSelectedCountText = getString(R.string.feed_group_dialog_selection_count, this.selectedSubscriptions.size)
+                    subscriptionsCount = this.selectedSubscriptions.size
+                    val updateSelectedCountText = resources.getQuantityString(R.plurals.feed_group_dialog_selection_count, subscriptionsCount, subscriptionsCount)
                     selected_subscription_count_view.text = updateSelectedCountText
                     subscriptions_selector_header_info.text = updateSelectedCountText
                 }
diff --git a/app/src/main/res/values-eo/strings.xml b/app/src/main/res/values-eo/strings.xml
index 88d45874d..e4e3d708d 100644
--- a/app/src/main/res/values-eo/strings.xml
+++ b/app/src/main/res/values-eo/strings.xml
@@ -547,6 +547,46 @@
         <item quantity="one">%s sekundo</item>
         <item quantity="other">%s sekundoj</item>
     </plurals>
+    <plurals name="minutes">
+        <item quantity="one">%d minuto</item>
+        <item quantity="other">%d minutoj</item>
+    </plurals>
+
+    <plurals name="hours">
+        <item quantity="one">%d horo</item>
+        <item quantity="other">%d horoj</item>
+    </plurals>
+
+    <plurals name="days">
+        <item quantity="one">%d tago</item>
+        <item quantity="other">%d tagoj</item>
+    </plurals>
+
+    <!-- Feed -->
+    <string name="feed_groups_header_title">Abonfluoj grupoj</string>
+    <string name="feed_oldest_subscription_update">Lasta ĝisdatigo: %s</string>
+    <string name="feed_subscription_not_loaded_count">Ne ŝarĝitaj: %d</string>
+    <string name="feed_notification_loading">Ŝarĝante abonfluon…</string>
+    <string name="feed_processing_message">Procesante abonfluon…</string>
+    <string name="feed_group_dialog_select_subscriptions">Seletkti abonojn</string>
+    <plurals name="feed_group_dialog_selection_count">
+        <item quantity="one">Selektita: %d</item>
+        <item quantity="other">Selektitaj: %d</item>
+    </plurals>
+    <string name="feed_group_dialog_empty_selection">No subscription selected</string>
+    <string name="feed_group_dialog_empty_name">Malplena grupa nomo</string>
+    <string name="feed_group_dialog_name_input">Nomo</string>
+    <string name="feed_group_dialog_delete_message">Ĉu vi volas forviŝi tion grupon?</string>
+    <string name="feed_create_new_group_button_title">Nova</string>
+
+    <string name="settings_category_feed_title">Abonfluo</string>
+    <string name="feed_update_threshold_title">Abonflua ĝisdatiga sojlo</string>
+    <string name="feed_update_threshold_summary">Tempo post lasta ĝisdatigo antaŭ abono estas konsiderita malĝisdatigita — %s</string>
+    <string name="feed_update_threshold_option_always_update">Ĉiam ĝisdatigi</string>
+    <string name="feed_use_dedicated_fetch_method_title">Ŝarĝi el dediĉita abonfluo kiam ĝi haveblas</string>
+    <string name="feed_use_dedicated_fetch_method_summary">Havebla en kelkaj servoj, ĝi estas ĝenerale multe pli rapida, sed povas doni limigita kvanto da aĵoj kaj ofte malpreciza informoj (ekzemple: neniu duracio, ajâ tipo, neniu « nuna » statuso).</string>
+    <string name="feed_use_dedicated_fetch_method_enable_button">Ŝalti rapidan modon</string>
+    <string name="feed_use_dedicated_fetch_method_disable_button">Malŝati rapidan modon</string>
     <string name="new_seek_duration_toast">Pro ExoPlayer limoj, la serĉa daŭro estas metita %d sekundojn</string>
     <string name="mute">Mutigi</string>
     <string name="unmute">Malmutigi</string>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index a4f05d5f1..876900688 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -546,13 +546,12 @@
     <string name="new_seek_duration_toast">En raison des contraintes d’ExoPlayer, le pas de déplacement a été réglée à %d secondes</string>
     <string name="mute">Couper le son</string>
     <string name="unmute">Remettre le son</string>
-
-    <!-- Time duration plurals -->
     <plurals name="dynamic_seek_duration_description">
         <item quantity="one">%s seconde</item>
         <item quantity="other">%s secondes</item>
     </plurals>
 
+    <!-- Time duration plurals -->
     <plurals name="minutes">
         <item quantity="one">%d minute</item>
         <item quantity="other">%d minutes</item>
@@ -576,8 +575,11 @@
     <string name="feed_notification_loading">Chargement du flux…</string>
     <string name="feed_processing_message">Préparation du flux…</string>
     <string name="feed_group_dialog_select_subscriptions">Choisir les abonnements</string>
-    <string name="feed_group_dialog_selection_count">Sélectionnés : %d</string>
     <string name="feed_group_dialog_empty_selection">Aucun abonnement sélectionné</string>
+    <plurals name="feed_group_dialog_selection_count">
+        <item quantity="one">Sélectionné : %d</item>
+        <item quantity="other">Sélectionnés : %d</item>
+    </plurals>
     <string name="feed_group_dialog_empty_name">Nom de groupe vide</string>
     <string name="feed_group_dialog_name_input">Nom</string>
     <string name="feed_group_dialog_delete_message">Voulez-vous supprimer ce groupe ?</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index d2c0f3411..3f4ff7c00 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -623,8 +623,11 @@
     <string name="feed_notification_loading">Loading feed…</string>
     <string name="feed_processing_message">Processing feed…</string>
     <string name="feed_group_dialog_select_subscriptions">Select subscriptions</string>
-    <string name="feed_group_dialog_selection_count">Selected: %d</string>
     <string name="feed_group_dialog_empty_selection">No subscription selected</string>
+    <plurals name="feed_group_dialog_selection_count">
+        <item quantity="one">Selected: %d</item>
+        <item quantity="other">Selected: %d</item>
+    </plurals>
     <string name="feed_group_dialog_empty_name">Empty group name</string>
     <string name="feed_group_dialog_name_input">Name</string>
     <string name="feed_group_dialog_delete_message">Do you want to delete this group?</string>