Skip to content

Commit 1b5a56c

Browse files
ashishkumar468maskaravivek
authored andcommitted
Bugfix/issue 2580 (commons-app#2584)
* Corrected string placedholders in certain string files * Corrected string placedholders in certain string files[Bug fix commons-app#2580]
1 parent b5051f9 commit 1b5a56c

File tree

5 files changed

+6
-5
lines changed

5 files changed

+6
-5
lines changed

app/src/main/java/fr/free/nrw/commons/category/GridViewAdapter.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
import android.app.Activity;
44
import android.content.Context;
5+
import android.text.TextUtils;
56
import android.view.LayoutInflater;
67
import android.view.View;
78
import android.view.ViewGroup;
@@ -100,7 +101,7 @@ public View getView(int position, View convertView, ViewGroup parent) {
100101
* @param author
101102
*/
102103
private void setAuthorView(Media item, TextView author) {
103-
if (item.getCreator() != null && !item.getCreator().equals("")) {
104+
if (!TextUtils.isEmpty(item.getCreator())) {
104105
String uploadedByTemplate = context.getString(R.string.image_uploaded_by);
105106

106107
String uploadedBy = String.format(Locale.getDefault(), uploadedByTemplate, item.getCreator());

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -303,7 +303,7 @@
303303
<string name="showcase_view_plus_fab">يمكنك رفع صورة لأي مكان من معرضك أو كاميرتك</string>
304304
<string name="no_images_found">لم يتم العثور على صور!</string>
305305
<string name="error_loading_images">حدث خطأ أثناء تحميل الصور.</string>
306-
<string name="image_uploaded_by">تم الرفع بواسطة: %1$s</string>
306+
<string name="image_uploaded_by">%1$s :تم الرفع بواسطة</string>
307307
<string name="block_notification">أنت ممنوع من تحرير كومنز</string>
308308
<string name="appwidget_img">صورة اليوم</string>
309309
<string name="app_widget_heading">صورة اليوم</string>

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -273,7 +273,7 @@
273273
<string name="showcase_view_plus_fab">場所の写真をアップロードするには、ギャラリーから選ぶことも撮影することもできます</string>
274274
<string name="no_images_found">画像がありません</string>
275275
<string name="error_loading_images">画像の読み込み中にエラーが発生しました</string>
276-
<string name="image_uploaded_by">アップロードした人: %1$</string>
276+
<string name="image_uploaded_by">アップロードした人: %1$s</string>
277277
<string name="appwidget_img">今日の一枚</string>
278278
<string name="app_widget_heading">今日の一枚</string>
279279
<string name="menu_search_button">検索</string>

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -241,7 +241,7 @@
241241
<string name="showcase_view_got_it_button">Wszystko jasne!</string>
242242
<string name="no_images_found">Nie znaleziono grafik!</string>
243243
<string name="error_loading_images">Wystąpił błąd podczas ładowania grafik.</string>
244-
<string name="image_uploaded_by">Przesłano przez $1</string>
244+
<string name="image_uploaded_by">Przesłano przez %1$s</string>
245245
<string name="menu_search_button">Szukaj</string>
246246
<string name="search_recent_header">Ostatnie wyszukiwania:</string>
247247
<string name="provider_searches">Ostatnio wyszukiwane zapytania</string>

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -308,7 +308,7 @@
308308
<string name="showcase_view_plus_fab">您可以从您的图库或照相机中上传任意地点的图片</string>
309309
<string name="no_images_found">找不到图片!</string>
310310
<string name="error_loading_images">加载图片时出错。</string>
311-
<string name="image_uploaded_by">由%1$s上传</string>
311+
<string name="image_uploaded_by">由%1$s上传: %1$s</string>
312312
<string name="block_notification">你被禁止编辑共享资源</string>
313313
<string name="appwidget_img">每日图片</string>
314314
<string name="app_widget_heading">每日图片</string>

0 commit comments

Comments
 (0)