Use proper plurals when showing number of episodes

AntennaPod · Feb 15, 2024 · 06fdc1c · 06fdc1c
1 parent c07ae17
commit 06fdc1c
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 10 deletions.
diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/QueueFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/QueueFragment.java
@@ -33,7 +33,6 @@
 import org.greenrobot.eventbus.ThreadMode;
 
 import java.util.List;
-import java.util.Locale;
 
 import de.danoeh.antennapod.R;
 import de.danoeh.antennapod.activity.MainActivity;
@@ -477,9 +476,8 @@ public void onSaveInstanceState(@NonNull Bundle outState) {
     }
 
     private void refreshInfoBar() {
-        String info = String.format(Locale.getDefault(), "%d%s",
-                queue.size(), getString(R.string.episodes_suffix));
-        if (queue.size() > 0) {
+        String info = getResources().getQuantityString(R.plurals.num_episodes, queue.size(), queue.size());
+        if (!queue.isEmpty()) {
             long timeLeft = 0;
             for (FeedItem item : queue) {
                 float playbackSpeed = 1;

diff --git a/ui/i18n/src/main/res/values/strings.xml b/ui/i18n/src/main/res/values/strings.xml
@@ -123,7 +123,6 @@
     <string name="description_label">Description</string>
     <string name="shownotes_label">Shownotes</string>
     <string name="shownotes_contentdescription">swipe up to read shownotes</string>
-    <string name="episodes_suffix">\u0020episodes</string>
     <string name="close_label">Close</string>
     <string name="retry_label">Retry</string>
     <string name="auto_download_label">Include in auto downloads</string>

diff --git a/...main/java/de/danoeh/antennapod/ui/statistics/downloads/DownloadStatisticsListAdapter.java b/...main/java/de/danoeh/antennapod/ui/statistics/downloads/DownloadStatisticsListAdapter.java
@@ -10,7 +10,6 @@
 import de.danoeh.antennapod.ui.statistics.feed.FeedStatisticsDialogFragment;
 
 import java.util.List;
-import java.util.Locale;
 
 /**
  * Adapter for the download statistics list.
@@ -45,10 +44,10 @@ protected PieChartView.PieChartData generateChartData(List<StatisticsItem> stati
 
     @Override
     protected void onBindFeedViewHolder(StatisticsHolder holder, StatisticsItem item) {
-        holder.value.setText(Formatter.formatShortFileSize(context, item.totalDownloadSize)
-                + " • "
-                + String.format(Locale.getDefault(), "%d%s",
-                item.episodesDownloadCount, context.getString(R.string.episodes_suffix)));
+        int numEpisodes = (int) item.episodesDownloadCount;
+        String text = Formatter.formatShortFileSize(context, item.totalDownloadSize);
+        text += " • " + context.getResources().getQuantityString(R.plurals.num_episodes, numEpisodes, numEpisodes);
+        holder.value.setText(text);
 
         holder.itemView.setOnClickListener(v -> {
             FeedStatisticsDialogFragment yourDialogFragment = FeedStatisticsDialogFragment.newInstance(