Skip to content

Commit a53846e

Browse files
committed
Fix build
1 parent 32d6688 commit a53846e

File tree

2 files changed

+8
-8
lines changed

2 files changed

+8
-8
lines changed

app/src/main/java/fr/free/nrw/commons/Media.java

+1-6
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
import java.util.Date;
1010
import java.util.HashMap;
1111
import java.util.List;
12-
import java.util.Locale;
1312
import java.util.Map;
1413
import java.util.regex.Matcher;
1514
import java.util.regex.Pattern;
@@ -486,11 +485,7 @@ public static Media from(MwQueryPage page) {
486485
StringUtils.getParsedStringFromHtml(metadata.artist().value())
487486
);
488487

489-
String language = Locale.getDefault().getLanguage();
490-
if (StringUtils.isNullOrWhiteSpace(language)) {
491-
language = "default";
492-
}
493-
media.setDescriptions(Collections.singletonMap(language, metadata.imageDescription().value()));
488+
media.setDescriptions(Collections.singletonMap("default", metadata.imageDescription().value()));
494489
media.setCategories(MediaDataExtractorUtil.extractCategoriesFromList(metadata.categories().value()));
495490
String latitude = metadata.gpsLatitude().value();
496491
String longitude = metadata.gpsLongitude().value();

app/src/main/java/fr/free/nrw/commons/mwapi/OkHttpJsonApiClient.java

+7-2
Original file line numberDiff line numberDiff line change
@@ -267,8 +267,13 @@ public Single<Media> getMedia(String titles, boolean useGenerator) {
267267
private HttpUrl.Builder appendMediaProperties(HttpUrl.Builder builder) {
268268
builder.addQueryParameter("prop", "imageinfo")
269269
.addQueryParameter("iiprop", "url|extmetadata")
270-
.addQueryParameter("iiextmetadatafilter", "DateTime|Categories|GPSLatitude|GPSLongitude|ImageDescription|DateTimeOriginal|Artist|LicenseShortName")
271-
.addQueryParameter("iiextmetadatamultilang", String.valueOf(true));
270+
.addQueryParameter("iiextmetadatafilter", "DateTime|Categories|GPSLatitude|GPSLongitude|ImageDescription|DateTimeOriginal|Artist|LicenseShortName");
271+
272+
String language = Locale.getDefault().getLanguage();
273+
if (!StringUtils.isNullOrWhiteSpace(language)) {
274+
builder.addQueryParameter("iiextmetadatalanguage", language);
275+
}
276+
272277
return builder;
273278
}
274279

0 commit comments

Comments
 (0)