From 1b5a56c7e65a81fd382d33d3c4cbea994ca9fde3 Mon Sep 17 00:00:00 2001
From: Ashish Kumar <ashishkumar468@gmail.com>
Date: Fri, 15 Mar 2019 09:16:15 +0530
Subject: [PATCH] Bugfix/issue 2580 (#2584)

* Corrected string placedholders in certain string files

* Corrected string placedholders in certain string files[Bug fix #2580]
---
 .../java/fr/free/nrw/commons/category/GridViewAdapter.java     | 3 ++-
 app/src/main/res/values-ar/strings.xml                         | 2 +-
 app/src/main/res/values-ja/strings.xml                         | 2 +-
 app/src/main/res/values-pl/strings.xml                         | 2 +-
 app/src/main/res/values-zh/strings.xml                         | 2 +-
 5 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/fr/free/nrw/commons/category/GridViewAdapter.java b/app/src/main/java/fr/free/nrw/commons/category/GridViewAdapter.java
index 988e992fa..f9c7abb6e 100644
--- a/app/src/main/java/fr/free/nrw/commons/category/GridViewAdapter.java
+++ b/app/src/main/java/fr/free/nrw/commons/category/GridViewAdapter.java
@@ -2,6 +2,7 @@ package fr.free.nrw.commons.category;
 
 import android.app.Activity;
 import android.content.Context;
+import android.text.TextUtils;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -100,7 +101,7 @@ public class GridViewAdapter extends ArrayAdapter {
      * @param author
      */
     private void setAuthorView(Media item, TextView author) {
-        if (item.getCreator() != null && !item.getCreator().equals("")) {
+        if (!TextUtils.isEmpty(item.getCreator())) {
             String uploadedByTemplate = context.getString(R.string.image_uploaded_by);
 
             String uploadedBy = String.format(Locale.getDefault(), uploadedByTemplate, item.getCreator());
diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml
index ec76bc26c..9abcb37bf 100644
--- a/app/src/main/res/values-ar/strings.xml
+++ b/app/src/main/res/values-ar/strings.xml
@@ -303,7 +303,7 @@
   <string name="showcase_view_plus_fab">يمكنك رفع صورة لأي مكان من معرضك أو كاميرتك</string>
   <string name="no_images_found">لم يتم العثور على صور!</string>
   <string name="error_loading_images">حدث خطأ أثناء تحميل الصور.</string>
-  <string name="image_uploaded_by">تم الرفع بواسطة: %1$s</string>
+  <string name="image_uploaded_by">%1$s :تم الرفع بواسطة</string>
   <string name="block_notification">أنت ممنوع من تحرير كومنز</string>
   <string name="appwidget_img">صورة اليوم</string>
   <string name="app_widget_heading">صورة اليوم</string>
diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
index 08a11203b..6f5baf1ea 100644
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -273,7 +273,7 @@
   <string name="showcase_view_plus_fab">場所の写真をアップロードするには、ギャラリーから選ぶことも撮影することもできます</string>
   <string name="no_images_found">画像がありません</string>
   <string name="error_loading_images">画像の読み込み中にエラーが発生しました</string>
-  <string name="image_uploaded_by">アップロードした人: %1$</string>
+  <string name="image_uploaded_by">アップロードした人: %1$s</string>
   <string name="appwidget_img">今日の一枚</string>
   <string name="app_widget_heading">今日の一枚</string>
   <string name="menu_search_button">検索</string>
diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
index d9343ecce..37d73b2e9 100644
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -241,7 +241,7 @@
   <string name="showcase_view_got_it_button">Wszystko jasne!</string>
   <string name="no_images_found">Nie znaleziono grafik!</string>
   <string name="error_loading_images">Wystąpił błąd podczas ładowania grafik.</string>
-  <string name="image_uploaded_by">Przesłano przez $1</string>
+  <string name="image_uploaded_by">Przesłano przez %1$s</string>
   <string name="menu_search_button">Szukaj</string>
   <string name="search_recent_header">Ostatnie wyszukiwania:</string>
   <string name="provider_searches">Ostatnio wyszukiwane zapytania</string>
diff --git a/app/src/main/res/values-zh/strings.xml b/app/src/main/res/values-zh/strings.xml
index cd9bd803d..c14274151 100644
--- a/app/src/main/res/values-zh/strings.xml
+++ b/app/src/main/res/values-zh/strings.xml
@@ -308,7 +308,7 @@
   <string name="showcase_view_plus_fab">您可以从您的图库或照相机中上传任意地点的图片</string>
   <string name="no_images_found">找不到图片！</string>
   <string name="error_loading_images">加载图片时出错。</string>
-  <string name="image_uploaded_by">由%1$s上传</string>
+  <string name="image_uploaded_by">由%1$s上传: %1$s</string>
   <string name="block_notification">你被禁止编辑共享资源</string>
   <string name="appwidget_img">每日图片</string>
   <string name="app_widget_heading">每日图片</string>