diff --git a/app/src/main/java/fr/free/nrw/commons/upload/UploadActivity.java b/app/src/main/java/fr/free/nrw/commons/upload/UploadActivity.java index 0ceded411..647920dc3 100644 --- a/app/src/main/java/fr/free/nrw/commons/upload/UploadActivity.java +++ b/app/src/main/java/fr/free/nrw/commons/upload/UploadActivity.java @@ -252,13 +252,14 @@ public class UploadActivity extends AuthenticatedActivity implements UploadView, @SuppressLint("StringFormatInvalid") @Override - public void updateLicenseSummary(String selectedLicense) { + public void updateLicenseSummary(String selectedLicense, int imageCount) { String licenseHyperLink = "" + getString(Utils.licenseNameFor(selectedLicense)) + "
"; licenseSummary.setMovementMethod(LinkMovementMethod.getInstance()); licenseSummary.setText( Html.fromHtml( - getString(R.string.share_license_summary, licenseHyperLink))); + getResources().getQuantityString(R.plurals.share_license_summary, + imageCount, licenseHyperLink))); } @Override diff --git a/app/src/main/java/fr/free/nrw/commons/upload/UploadPresenter.java b/app/src/main/java/fr/free/nrw/commons/upload/UploadPresenter.java index 299e55a8f..781c158bd 100644 --- a/app/src/main/java/fr/free/nrw/commons/upload/UploadPresenter.java +++ b/app/src/main/java/fr/free/nrw/commons/upload/UploadPresenter.java @@ -112,7 +112,7 @@ public class UploadPresenter { */ void selectLicense(String licenseName) { uploadModel.setSelectedLicense(licenseName); - view.updateLicenseSummary(uploadModel.getSelectedLicense()); + view.updateLicenseSummary(uploadModel.getSelectedLicense(), uploadModel.getCount()); } //region Wizard step management @@ -357,7 +357,7 @@ public class UploadPresenter { private void updateLicenses() { String selectedLicense = uploadModel.getSelectedLicense(); view.updateLicenses(uploadModel.getLicenses(), selectedLicense); - view.updateLicenseSummary(selectedLicense); + view.updateLicenseSummary(selectedLicense, uploadModel.getCount()); } /** diff --git a/app/src/main/java/fr/free/nrw/commons/upload/UploadView.java b/app/src/main/java/fr/free/nrw/commons/upload/UploadView.java index 410914446..a91574004 100644 --- a/app/src/main/java/fr/free/nrw/commons/upload/UploadView.java +++ b/app/src/main/java/fr/free/nrw/commons/upload/UploadView.java @@ -60,7 +60,7 @@ public interface UploadView { void updateLicenses(List licenses, String selectedLicense); - void updateLicenseSummary(String selectedLicense); + void updateLicenseSummary(String selectedLicense, int imageCount); void updateTopCardContent(); diff --git a/app/src/main/res/layout/activity_upload_license.xml b/app/src/main/res/layout/activity_upload_license.xml index 0f3391128..2ed9ee0c6 100644 --- a/app/src/main/res/layout/activity_upload_license.xml +++ b/app/src/main/res/layout/activity_upload_license.xml @@ -62,7 +62,7 @@ android:layout_marginEnd="@dimen/standard_gap" android:layout_marginRight="@dimen/standard_gap" android:layout_below="@id/license_list" - android:text="@string/share_license_summary" /> + android:text="@plurals/share_license_summary" /> You have not yet uploaded any photos. Retry Cancel - This image will be licensed under %1$s + + This image will be licensed under %1$s + These images will be licensed under %1$s + By submitting this picture, I declare that this is my own work, that it does not contain copyrighted material or selfies, and otherwise adheres to <a href=\"https://commons.wikimedia.org/wiki/Commons:Policies_and_guidelines\">Wikimedia Commons policies</a>. Download Default License