From d828ec842b62077e887ff7fabcfbba29578b34c1 Mon Sep 17 00:00:00 2001 From: Ashish Date: Sun, 29 Nov 2020 22:13:06 +0530 Subject: [PATCH] Fixes #343 Removed the quantity item zero from string plural contributions_subtitle Handled zero uplaod count from MainActivity --- .../fr/free/nrw/commons/contributions/MainActivity.java | 6 ++++-- app/src/main/res/values/strings.xml | 4 +--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/app/src/main/java/fr/free/nrw/commons/contributions/MainActivity.java b/app/src/main/java/fr/free/nrw/commons/contributions/MainActivity.java index 26fa55bc23..97a6515a1e 100644 --- a/app/src/main/java/fr/free/nrw/commons/contributions/MainActivity.java +++ b/app/src/main/java/fr/free/nrw/commons/contributions/MainActivity.java @@ -207,9 +207,11 @@ public void showTabs() { */ public void setNumOfUploads(int uploadCount) { if (activeFragment == ActiveFragment.CONTRIBUTIONS) { - setTitle(getResources().getString(R.string.contributions_fragment) +" "+ getResources() + setTitle(getResources().getString(R.string.contributions_fragment) +" "+ ( + !(uploadCount == 0) ? + getResources() .getQuantityString(R.plurals.contributions_subtitle, - uploadCount, uploadCount)); + uploadCount, uploadCount):getString(R.string.contributions_subtitle_zero))); } } diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 63b55dc8f1..aaa9cb0fb8 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -5,8 +5,6 @@ %1$d files uploading - - @string/contributions_subtitle_zero (%1$d) (%1$d) @@ -98,7 +96,7 @@ List GPS is disabled in your device. Would you like to enable it? Enable GPS - No uploads yet + (No uploads yet) No categories matching %1$s found No Wikidata items matching %1$s found %1$s has no child classes