From def0d3da43eb74e794105852db4c036a417c4183 Mon Sep 17 00:00:00 2001
From: Christian Fotteler <47518265+chris-fo@users.noreply.github.com>
Date: Tue, 5 Mar 2019 18:51:41 +0100
Subject: [PATCH] Fixes Lego Messages in strings.xml for "uploaded_by_myself"
 and changes the message generation in "ReasonBuilder.java". Adds translations
 for "uploaded_by_myself"-String in English, German, French, Spanish and
 Dutch. (#2532)

---
 .../main/java/fr/free/nrw/commons/delete/ReasonBuilder.java | 6 ++----
 app/src/main/res/values-de/strings.xml                      | 4 +---
 app/src/main/res/values-es/strings.xml                      | 6 ++----
 app/src/main/res/values-fr/strings.xml                      | 6 ++----
 app/src/main/res/values-nl/strings.xml                      | 1 +
 app/src/main/res/values/strings.xml                         | 4 +---
 6 files changed, 9 insertions(+), 18 deletions(-)

diff --git a/app/src/main/java/fr/free/nrw/commons/delete/ReasonBuilder.java b/app/src/main/java/fr/free/nrw/commons/delete/ReasonBuilder.java
index 7ef5d342f..96f1bab7e 100644
--- a/app/src/main/java/fr/free/nrw/commons/delete/ReasonBuilder.java
+++ b/app/src/main/java/fr/free/nrw/commons/delete/ReasonBuilder.java
@@ -54,10 +54,8 @@ public class ReasonBuilder {
     }
 
     private String appendArticlesUsed(FeedbackResponse object, Media media, String reason) {
-        reason += context.getString(R.string.uploaded_by_myself) + prettyUploadedDate(media);
-        reason += context.getString(R.string.used_by)
-                + object.getArticlesUsingImages()
-                + context.getString(R.string.articles);
+        String reason1Template = context.getString(R.string.uploaded_by_myself);
+        reason += String.format(Locale.getDefault(), reason1Template, prettyUploadedDate(media), object.getArticlesUsingImages());
         Timber.i("New Reason %s", reason);
         return reason;
     }
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 22aee2b5f..8a1af3d86 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -401,9 +401,7 @@
   <string name="deletion_reason_bad_for_my_privacy">Ich habe erkannt, dass es schlecht für meine Privatsphäre ist.</string>
   <string name="deletion_reason_no_longer_want_public">Ich habe meine Meinung geändert. Ich möchte nicht mehr, dass es öffentlich sichtbar ist.</string>
   <string name="deletion_reason_not_interesting">Entschuldigung, aber dieses Bild ist nicht für eine Enzyklopädie relevant.</string>
-  <string name="uploaded_by_myself">Von mir hochgeladen am</string>
-  <string name="used_by">, verwendet in</string>
-  <string name="articles">Artikel</string>
+  <string name="uploaded_by_myself">Von mir hochgeladen am %1$s, verwendet in %2$d Artikel(n).</string>
   <string name="no_uploads">Willkommen bei Commons!\n\nLade deine erste Datei hoch, indem du oben auf das Kamera- oder Galeriesymbol tippst.</string>
   <string name="desc_language_Worldwide">Weltweit</string>
   <string name="desc_language_America">Amerika</string>
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index fd2e2c9eb..19f02e145 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -408,10 +408,8 @@
   <string name="deletion_reason_bad_for_my_privacy">Me di cuenta que es malo para mi privacidad</string>
   <string name="deletion_reason_no_longer_want_public">Cambié de opinión, no quiero que siga siendo visible públicamente</string>
   <string name="deletion_reason_not_interesting">Lo sentimos, esta imagen no es interesante para una enciclopedia</string>
-  <string name="uploaded_by_myself">Subida por mí mismo el</string>
-  <string name="used_by">, usado en</string>
-  <string name="articles">artículos</string>
-  <string name="no_uploads">¡Bienvenido a Commons!\n\nSube tu primer archivo tocando el icono de la cámara o galería arriba.</string>
+  <string name="uploaded_by_myself">Subida por mí mismo el %1$s, usado en %2$d artículo(s).</string>
+    <string name="no_uploads">¡Bienvenido a Commons!\n\nSube tu primer archivo tocando el icono de la cámara o galería arriba.</string>
   <string name="desc_language_Worldwide">Mundial</string>
   <string name="desc_language_America">América</string>
   <string name="desc_language_Europe">Europa</string>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 235ce15ef..d60b76364 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -417,10 +417,8 @@
   <string name="deletion_reason_bad_for_my_privacy">J\'ai pensé que ce n\'était pas bon pour ma vie privée</string>
   <string name="deletion_reason_no_longer_want_public">J\'ai changé d\'avis, je ne désire plus qu\'il soit visible publiquement</string>
   <string name="deletion_reason_not_interesting">Désolé mais cette image n\'est pas intéressante pour une encyclopédie</string>
-  <string name="uploaded_by_myself">Téléversé par moi-même le</string>
-  <string name="used_by">,utilisé dans</string>
-  <string name="articles">articles</string>
-  <string name="no_uploads">Bienvenue sur Commons !\n\nTéléversez votre premier média en cliquant sur l’icône de l’appareil photo ou sur la galerie ci-dessus.</string>
+  <string name="uploaded_by_myself">Téléversé par moi-même le %1$s, utilisé dans %2$d article(s).</string>
+    <string name="no_uploads">Bienvenue sur Commons !\n\nTéléversez votre premier média en cliquant sur l’icône de l’appareil photo ou sur la galerie ci-dessus.</string>
   <string name="desc_language_Worldwide">Mondial</string>
   <string name="desc_language_America">Amérique</string>
   <string name="desc_language_Europe">Europe</string>
diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml
index 6616bc6a3..5cc200830 100644
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@@ -244,4 +244,5 @@
   <string name="menu_option_unread">Ongelezen bekijken</string>
   <string name="image_chooser_title">Kies de afbeeldingen die u wilt plaatsen</string>
   <string name="please_wait">Een ogenblik geduld…</string>
+    <string name="uploaded_by_myself">Geüpload van mij op %1$s, gebruikt in %2$d artikel(s).</string>
 </resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 2d3c24fb2..2c3d9b4fc 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -414,9 +414,7 @@
   <string name="deletion_reason_bad_for_my_privacy">I realized it is bad for my privacy</string>
   <string name="deletion_reason_no_longer_want_public">I changed my mind, I don\'t want it to be publicly visible anymore</string>
   <string name="deletion_reason_not_interesting">Sorry this picture is not interesting for an encyclopedia</string>
-  <string name="uploaded_by_myself">Uploaded by myself on</string>
-  <string name="used_by">,used in</string>
-  <string name="articles">articles</string>
+  <string name="uploaded_by_myself">Uploaded by myself on %1$s, used in %2$d article(s).</string>
 
   <string name="no_uploads">Welcome to Commons!\n
 Upload your first media by touching the camera or gallery icon above.</string>