From a5dc7f79c1bd76c6c45ecafe068ff2e2eab2902a Mon Sep 17 00:00:00 2001
From: Udit <uditverma5602@gmail.com>
Date: Fri, 12 May 2017 19:01:13 +0530
Subject: [PATCH] Fix - zero quantity in messages doesn't work in English #343
 (#546)

---
 .../commons/contributions/ContributionsActivity.java  | 11 ++++++++++-
 app/src/main/res/values/strings.xml                   |  4 +++-
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsActivity.java b/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsActivity.java
index bbe6d7411..6b1ad3d0d 100644
--- a/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsActivity.java
+++ b/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsActivity.java
@@ -21,6 +21,7 @@ import android.widget.Adapter;
 import android.widget.AdapterView;
 
 import java.util.ArrayList;
+import java.util.Locale;
 
 import fr.free.nrw.commons.CommonsApplication;
 import fr.free.nrw.commons.HandlerService;
@@ -216,7 +217,15 @@ public  class       ContributionsActivity
             ((CursorAdapter)contributionsList.getAdapter()).swapCursor(cursor);
         }
 
-        getSupportActionBar().setSubtitle(getResources().getQuantityString(R.plurals.contributions_subtitle, cursor.getCount(), cursor.getCount()));
+        if (cursor.getCount() == 0
+                && Locale.getDefault().getISO3Language().equals(Locale.ENGLISH.getISO3Language())) {
+            //cursor count is zero and language is english -
+            // we need to set the message for 0 case explicitly.
+            getSupportActionBar().setSubtitle(getResources()
+                    .getString(R.string.contributions_subtitle_zero));
+        } else {
+            getSupportActionBar().setSubtitle(getResources().getQuantityString(R.plurals.contributions_subtitle, cursor.getCount(), cursor.getCount()));
+        }
 
         contributionsList.clearSyncMessage();
         notifyAndMigrateDataSetObservers();
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index cfe25cda3..e741c211b 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -50,8 +50,10 @@
   <string name="categories_search_text_hint">Search categories</string>
   <string name="menu_save_categories">Save</string>
   <string name="refresh_button">Refresh</string>
+  <string name="contributions_subtitle_zero">No uploads yet</string>
   <plurals name="contributions_subtitle">
-    <item quantity="zero">No uploads yet</item>
+    <!--zero is not used in english. Category mentioned here for easy reference in future-->
+    <item quantity="zero">@string/contributions_subtitle_zero</item>
     <item quantity="one">%d upload</item>
     <item quantity="other">%d uploads</item>
   </plurals>