Merge branch '3.1-release' into 3.1-release-alpha

Author: misaochan

app/src/main/java/fr/free/nrw/commons/upload/PageContentsCreator.java

@@ -55,18 +55,18 @@ public String createFrom(final Contribution contribution, final String countryCo
 
         buffer.append("}}").append("\n");
 
-        if (contribution.getWikidataPlace()!=null && contribution.getWikidataPlace().isMonumentUpload()) {
-            buffer.append("{{Test-Wiki Loves Monuments 2021|1= ")
-                .append(countryCode)
-                .append("}}").append("\n");
-        }
-
         //Only add Location template (e.g. {{Location|37.51136|-77.602615}} ) if coords is not null
         final String decimalCoords = contribution.getDecimalCoords();
         if (decimalCoords != null) {
             buffer.append("{{Location|").append(decimalCoords).append("}}").append("\n");
         }
 
+        if (contribution.getWikidataPlace()!=null && contribution.getWikidataPlace().isMonumentUpload()) {
+            buffer.append("{{Wiki Loves Monuments 2021|1= ")
+                .append(countryCode)
+                .append("}}").append("\n");
+        }
+
         buffer.append("== {{int:license-header}} ==\n")
             .append(licenseTemplateFor(media.getLicense())).append("\n\n")
             .append("{{Uploaded from Mobile|platform=Android|version=")

app/src/main/res/values/strings.xml

@@ -640,7 +640,7 @@ Upload your first media by tapping on the add button.</string>
   <string name="image_location">Image Location</string>
   <string name="check_whether_location_is_correct">Check whether location is correct</string>
   <string name="place_state_wlm">WLM</string>
-  <string name="wlm_upload_info">You are contributing to Wiki Loves Monuments Campaign. Related templates will be added accordingly.</string>
+  <string name="wlm_upload_info">This image will be entered into the Wiki Loves Monuments 2021 contest</string>
   <string name="display_monuments">Display monuments</string>
   <string name="wlm_month_message">It\'s Wiki Loves Monuments month!</string>
   <string name="learn_more">LEARN MORE</string>