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 #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)

Browse source
This commit is contained in:
Ashish 2021-10-31 20:42:06 +05:30 • committed by GitHub
parent 53e36f9ffa
commit 16e5047d60
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

7
app/src/main/java/fr/free/nrw/commons/upload/license/MediaLicenseFragment.java
View file

@ -161,13 +161,12 @@ public class MediaLicenseFragment extends UploadBaseFragment implements MediaLic
} }
@Override @Override
public void updateLicenseSummary(String licenseSummary, int numberOfItems) { public void updateLicenseSummary(final String licenseSummary, final int numberOfItems) {
String licenseHyperLink = "<a href='" + Utils.licenseUrlFor(licenseSummary) + "'>" + String licenseHyperLink = "<a href='" + Utils.licenseUrlFor(licenseSummary) + "'>" +
getString(Utils.licenseNameFor(licenseSummary)) + "</a><br>"; getString(Utils.licenseNameFor(licenseSummary)) + "</a><br>";
setTextViewHTML(tvShareLicenseSummary, getResources() setTextViewHTML(tvShareLicenseSummary, String.format("%s%s", getResources()
.getQuantityString(R.plurals.share_license_summary, numberOfItems, .getQuantityString(R.plurals.share_license_summary, numberOfItems), licenseHyperLink));
licenseHyperLink));
} }
private void setTextViewHTML(TextView textView, String text) { private void setTextViewHTML(TextView textView, String text) {

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

@ -18,8 +18,8 @@
<item quantity="other">%d uploads</item> <item quantity="other">%d uploads</item>
</plurals> </plurals>
<plurals name="share_license_summary"> <plurals name="share_license_summary">
<item quantity="one">This image will be licensed under %1$s</item> <item quantity="one">This image will be licensed under</item>
<item quantity="other">These images will be licensed under %1$s</item> <item quantity="other">These images will be licensed under</item>
</plurals> </plurals>
<plurals name="upload_count_title"> <plurals name="upload_count_title">
<item quantity="one">%1$d Upload</item> <item quantity="one">%1$d Upload</item>