From 0117c8de8782c55def197b587b8d06797df655dc Mon Sep 17 00:00:00 2001
From: Philip Whitehouse <philip@whiuk.com>
Date: Sun, 30 Jul 2017 13:23:50 +0100
Subject: [PATCH] Pluralisation of remote search download

---
 .../java/com/fsck/k9/fragment/MessageListFragment.java |  6 +++---
 k9mail/src/main/res/values/strings.xml                 | 10 ++++++++--
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/k9mail/src/main/java/com/fsck/k9/fragment/MessageListFragment.java b/k9mail/src/main/java/com/fsck/k9/fragment/MessageListFragment.java
index 175066d06..3eab54bf5 100644
--- a/k9mail/src/main/java/com/fsck/k9/fragment/MessageListFragment.java
+++ b/k9mail/src/main/java/com/fsck/k9/fragment/MessageListFragment.java
@@ -1340,10 +1340,10 @@ public class MessageListFragment extends Fragment implements OnItemClickListener
         public void remoteSearchServerQueryComplete(String folderName, int numResults, int maxResults) {
             handler.progress(true);
             if (maxResults != 0 && numResults > maxResults) {
-                handler.updateFooter(context.getString(R.string.remote_search_downloading_limited,
-                        maxResults, numResults));
+                handler.updateFooter(context.getResources().getQuantityString(R.plurals.remote_search_downloading_limited,
+                        maxResults, maxResults, numResults));
             } else {
-                handler.updateFooter(context.getString(R.string.remote_search_downloading, numResults));
+                handler.updateFooter(context.getResources().getQuantityString(R.plurals.remote_search_downloading, numResults));
             }
             fragmentListener.setMessageListProgress(Window.PROGRESS_START);
         }
diff --git a/k9mail/src/main/res/values/strings.xml b/k9mail/src/main/res/values/strings.xml
index dd21aa3af..0de5bb1f1 100644
--- a/k9mail/src/main/res/values/strings.xml
+++ b/k9mail/src/main/res/values/strings.xml
@@ -1058,8 +1058,14 @@ Please submit bug reports, contribute new features and ask questions at
     <string name="account_settings_remote_search_num_label">Server search limit</string>
     <string name="account_settings_remote_search_num_summary">Search will stop after finding <xliff:g id="num_results">%s</xliff:g> results.</string>
     <string name="remote_search_sending_query">Sending query to server</string>
-    <string name="remote_search_downloading">Fetching %d results</string>
-    <string name="remote_search_downloading_limited">Fetching %1$d of %2$d results</string>
+    <plurals name="remote_search_downloading">
+        <item quantity="one">Fetching %d result</item>
+        <item quantity="other">Fetching %d results</item>
+    </plurals>
+    <plurals name="remote_search_downloading_limited">
+        <item quantity="one">Fetching %1$d of %2$d results</item>
+        <item quantity="other">Fetching %1$d of %2$d results</item>
+    </plurals>
     <string name="remote_search_error">Remote search failed</string>
 
     <string name="account_settings_search">Search</string>