mnalis/apps-android-commons
1
0
Fork 0
mirror of https://github.com/commons-app/apps-android-commons.git synced 2025-10-26 12:23:58 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

#3780 Create media using a combination of Entities & MwQueryResult - update wikicode to align with expected behaviour

Browse source
This commit is contained in:
Sean Mac Gillicuddy 2020-06-18 09:02:52 +01:00
parent 6bbf392e32
commit eb9e94c603
1 changed files with 13 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

14
app/src/main/java/fr/free/nrw/commons/Media.java
View file

@ -12,6 +12,7 @@ import java.util.ArrayList;
import java.util.Collections;
import java.util.Date;
import java.util.List;
import java.util.Locale;
import java.util.Map;
import java.util.Objects;
import java.util.UUID;
@ -290,7 +291,18 @@ public class Media implements Parcelable {
* @return
*/
public String getWikiCode() {
return String.format("[[%s|thumb|%s]]", filename, getDisplayTitle());
return String.format("[[%s|thumb|%s]]", filename, getMostRelevantCaption());
}
private String getMostRelevantCaption() {
final String languageAppropriateCaption = captions.get(Locale.getDefault().getLanguage());
if(languageAppropriateCaption!=null){
return languageAppropriateCaption;
}
for (String firstCaption : captions.values()) {
return firstCaption;
}
return getDisplayTitle();
}
/**