From 16e5047d606b0a65dad11f80dffcc75cfe9c44b8 Mon Sep 17 00:00:00 2001 From: Ashish Date: Sun, 31 Oct 2021 20:42:06 +0530 Subject: [PATCH] Fixes #4653 - Special characters in this language (Myanmar) seems to be confused with positional argument's holder, extracted out the positional argument outside of quantity string for a possible fix (#4694) --- .../nrw/commons/upload/license/MediaLicenseFragment.java | 7 +++---- app/src/main/res/values/strings.xml | 4 ++-- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/app/src/main/java/fr/free/nrw/commons/upload/license/MediaLicenseFragment.java b/app/src/main/java/fr/free/nrw/commons/upload/license/MediaLicenseFragment.java index 9c1f3da48..9fada4c9e 100644 --- a/app/src/main/java/fr/free/nrw/commons/upload/license/MediaLicenseFragment.java +++ b/app/src/main/java/fr/free/nrw/commons/upload/license/MediaLicenseFragment.java @@ -161,13 +161,12 @@ public class MediaLicenseFragment extends UploadBaseFragment implements MediaLic } @Override - public void updateLicenseSummary(String licenseSummary, int numberOfItems) { + public void updateLicenseSummary(final String licenseSummary, final int numberOfItems) { String licenseHyperLink = "" + getString(Utils.licenseNameFor(licenseSummary)) + "
"; - setTextViewHTML(tvShareLicenseSummary, getResources() - .getQuantityString(R.plurals.share_license_summary, numberOfItems, - licenseHyperLink)); + setTextViewHTML(tvShareLicenseSummary, String.format("%s%s", getResources() + .getQuantityString(R.plurals.share_license_summary, numberOfItems), licenseHyperLink)); } private void setTextViewHTML(TextView textView, String text) { diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index a8187becc..197e42728 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -18,8 +18,8 @@ %d uploads - This image will be licensed under %1$s - These images will be licensed under %1$s + This image will be licensed under + These images will be licensed under %1$d Upload