Fix "expressions" not having the expression (and only having the tran…

…saltion)
cpina · Feb 2, 2024 · c8b7908 · c8b7908
1 parent ef91625
commit c8b7908
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/changelog b/changelog
@@ -2,6 +2,8 @@ qdacco 1.2.2 (UNRELEASED)
 ============
 -Fix entries such as "neighbor" where, inside the <translation> there was
 something such as <otherlocal>xxx</otherlocal>[MORE SPACES]</translation>
+-Fix "expressions" in entries (e.g. "taula"). They didn't have the expression
+meaning (only its translation). Similar problem as above
 
 qdacco 1.2.1 (October 2023)
 ============

diff --git a/nongui/StructureList.cpp b/nongui/StructureList.cpp
@@ -248,10 +248,10 @@ void StructureList::processEntry(QXmlStreamReader& reader) {
         m_translation.notes.append(ch);
     }
     else if (m_inFems) {
-        m_translation.female = ch;
+        m_translation.female += ch.trimmed();
     }
     else if (m_inFemPlural) {
-        m_translation.femalePlural = ch;
+        m_translation.femalePlural += ch.trimmed();
     }
     else if (m_inTranslation) {
         /* There are entries where the "translation" is between different parts. For example:
@@ -269,7 +269,7 @@ void StructureList::processEntry(QXmlStreamReader& reader) {
         m_translation.translation += ch.trimmed();
     }
     else if (m_inExpressions) {
-        m_expressions.expression = ch;
+        m_expressions.expression += ch.trimmed();
     }
     else if (m_inMistakes) {
         m_mistakes = ch;