narayana/conversations-classic
3
2
Fork 0
Code Issues 3 Pull requests 2 Actions Packages Projects Releases 4 Wiki Activity

inherit language from parent message when finding localized body

Browse source
This commit is contained in:
Daniel Gultsch 2019-09-12 12:42:42 +02:00
parent 9bf5fb98ac
commit a7c47a33fa
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/main/java/eu/siacs/conversations/xml/LocalizedContent.java
View file

@ -22,10 +22,12 @@ public class LocalizedContent {
public static LocalizedContent get(final Element element, String name) { public static LocalizedContent get(final Element element, String name) {
final HashMap<String, String> contents = new HashMap<>(); final HashMap<String, String> contents = new HashMap<>();
final String parentLanguage = element.getAttribute("xml:lang");
for(Element child : element.children) { for(Element child : element.children) {
if (name.equals(child.getName())) { if (name.equals(child.getName())) {
final String namespace = child.getNamespace(); final String namespace = child.getNamespace();
final String lang = child.getAttribute("xml:lang"); final String childLanguage = child.getAttribute("xml:lang");
final String lang = childLanguage == null ? parentLanguage : childLanguage;
final String content = child.getContent(); final String content = child.getContent();
if (content != null && (namespace == null || "jabber:client".equals(namespace))) { if (content != null && (namespace == null || "jabber:client".equals(namespace))) {
if (contents.put(lang, content) != null) { if (contents.put(lang, content) != null) {