Fix #2156: Add plural support for share_license_summary string (#2161)

commons-app · Dec 18, 2018 · db38174 · db38174
1 parent 1d80cba
commit db38174
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 8 deletions.
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
@@ -252,13 +252,14 @@ public void updateLicenses(List<String> licenses, String selectedLicense) {
 
     @SuppressLint("StringFormatInvalid")
     @Override
-    public void updateLicenseSummary(String selectedLicense) {
+    public void updateLicenseSummary(String selectedLicense, int imageCount) {
         String licenseHyperLink = "<a href='" + Utils.licenseUrlFor(selectedLicense)+"'>" +
                 getString(Utils.licenseNameFor(selectedLicense)) + "</a><br>";
         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
@@ -112,7 +112,7 @@ void receiveDirect(Uri media, String mimeType, @Contribution.FileSource String s
      */
     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 @@ private void updateCards() {
     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
@@ -60,7 +60,7 @@ public interface UploadView {
 
     void updateLicenses(List<String> 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
@@ -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" />
 
     <fr.free.nrw.commons.ui.widget.HtmlTextView
         android:id="@+id/media_upload_policy"

diff --git a/app/src/main/res/layout/fragment_single_upload.xml b/app/src/main/res/layout/fragment_single_upload.xml
@@ -87,7 +87,7 @@
             android:layout_marginTop="@dimen/standard_gap"
             android:clickable="true"
             android:gravity="center"
-            android:text="@string/share_license_summary"
+            android:text="@plurals/share_license_summary"
             android:textColorLink="@color/button_blue" />
 
         <fr.free.nrw.commons.ui.widget.HtmlTextView

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -101,7 +101,10 @@
   <string name="no_uploads_yet">You have not yet uploaded any photos.</string>
   <string name="menu_retry_upload">Retry</string>
   <string name="menu_cancel_upload">Cancel</string>
-  <string name="share_license_summary">This image will be licensed under %1$s</string>
+  <plurals name="share_license_summary">
+    <item quantity="one">This image will be licensed under %1$s</item>
+    <item quantity="other">These images will be licensed under %1$s</item>
+  </plurals>
   <string name="media_upload_policy">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 &lt;a href=\"https://commons.wikimedia.org/wiki/Commons:Policies_and_guidelines\"&gt;Wikimedia Commons policies&lt;/a&gt;.</string>
   <string name="menu_download">Download</string>
   <string name="preference_license">Default License</string>