mnalis/apps-android-commons
1
0
Fork 0
mirror of https://github.com/commons-app/apps-android-commons.git synced 2025-10-26 20:33:53 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Fixes #343 (#4057)

Browse source 
Removed the quantity item zero from string plural contributions_subtitle
Handled zero uplaod count from MainActivity
This commit is contained in:
Ashish 2020-12-01 16:38:30 +05:30 • committed by GitHub
parent 2c5a45760f
commit f1b40728b2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

6
app/src/main/java/fr/free/nrw/commons/contributions/MainActivity.java
View file

@ -207,9 +207,11 @@ public class MainActivity extends BaseActivity
*/ */
public void setNumOfUploads(int uploadCount) { public void setNumOfUploads(int uploadCount) {
if (activeFragment == ActiveFragment.CONTRIBUTIONS) { 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, .getQuantityString(R.plurals.contributions_subtitle,
uploadCount, uploadCount)); uploadCount, uploadCount):getString(R.string.contributions_subtitle_zero)));
} }
} }

4
app/src/main/res/values/strings.xml
View file

@ -5,8 +5,6 @@
<item quantity="other">%1$d files uploading</item> <item quantity="other">%1$d files uploading</item>
</plurals> </plurals>
<plurals name="contributions_subtitle"> <plurals name="contributions_subtitle">
<!--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">(%1$d)</item> <item quantity="one">(%1$d)</item>
<item quantity="other">(%1$d)</item> <item quantity="other">(%1$d)</item>
</plurals> </plurals>
@ -98,7 +96,7 @@
<string name="display_list_button">List</string> <string name="display_list_button">List</string>
<string name="gps_disabled">GPS is disabled in your device. Would you like to enable it?</string> <string name="gps_disabled">GPS is disabled in your device. Would you like to enable it?</string>
<string name="enable_gps">Enable GPS</string> <string name="enable_gps">Enable GPS</string>
<string name="contributions_subtitle_zero">No uploads yet</string> <string name="contributions_subtitle_zero">(No uploads yet)</string>
<string name="categories_not_found">No categories matching %1$s found</string> <string name="categories_not_found">No categories matching %1$s found</string>
<string name="depictions_not_found">No Wikidata items matching %1$s found</string> <string name="depictions_not_found">No Wikidata items matching %1$s found</string>
<string name="no_child_classes">%1$s has no child classes</string> <string name="no_child_classes">%1$s has no child classes</string>