MCL/sf/mw/qt: comparison tools/linguist/lupdate/merge.cpp

equal deleted inserted replaced

-:56cd8111b7f7
+:41300fa6a67c
 for (u = untranslated.begin(); u != untranslated.end(); ++u) {
 t = translated.find(zeroKey((*u).sourceText()));
 if (t != translated.end() && !t.key().isEmpty()
 && t->sourceText() != u->sourceText()) {
-TranslatorMessage m = *u;
+u->setTranslation(translationAttempt(t->translation(), t->sourceText(),
-m.setTranslation(translationAttempt(t->translation(), t->sourceText(),
+u->sourceText()));
-u->sourceText()));
-tor.replace(m);
 inserted++;
 }
 }
 return inserted;
 }
 for (u = untranslated.begin(); u != untranslated.end(); ++u) {
 QString key = u->sourceText();
 t = translated.find(key);
 if (t != translated.end()) {
-TranslatorMessage m = *u;
+u->setTranslations(t->translations());
-m.setTranslations(t->translations());
-tor.replace(m);
 ++inserted;
 }
 }
 return inserted;
 }
 are updated according to the virgin translator.
 */
 foreach (TranslatorMessage m, tor.messages()) {
 TranslatorMessage::Type newType = TranslatorMessage::Finished;
-if (m.sourceText().isEmpty()) {
+if (m.sourceText().isEmpty() && m.id().isEmpty()) {
 // context/file comment
 TranslatorMessage mv = virginTor.find(m.context());
 if (!mv.isNull())
 m.setComment(mv.comment());
 } else {
-TranslatorMessage mv = virginTor.find(m.context(), m.sourceText(), m.comment());
+TranslatorMessage mv;
-if (mv.isNull()) {
+int mvi = virginTor.find(m);
+if (mvi < 0) {
 if (!(options & HeuristicSimilarText)) {
+makeObsolete:
 newType = TranslatorMessage::Obsolete;
 if (m.type() != TranslatorMessage::Obsolete)
 obsoleted++;
 m.clearReferences();
 } else {
 mv = virginTor.find(m.context(), m.comment(), m.allReferences());
 if (mv.isNull()) {
 // did not find it in the virgin, mark it as obsolete
-newType = TranslatorMessage::Obsolete;
+goto makeObsolete;
-if (m.type() != TranslatorMessage::Obsolete)
-obsoleted++;
-m.clearReferences();
 } else {
 // Do not just accept it if its on the same line number,
 // but different source text.
 // Also check if the texts are more or less similar before
 // we consider them to represent the same message...
 // was changed it might require re-translating...)
 newType = TranslatorMessage::Unfinished;
 ++similarTextHeuristicCount;
 neww++;
+outdateSource:
 m.setOldSourceText(m.sourceText());
 m.setSourceText(mv.sourceText());
 const QString &oldpluralsource = m.extra(QLatin1String("po-msgid_plural"));
 if (!oldpluralsource.isEmpty()) {
 m.setExtra(QLatin1String("po-old_msgid_plural"), oldpluralsource);
 m.unsetExtra(QLatin1String("po-msgid_plural"));
 }
-m.setReferences(mv.allReferences()); // Update secondary references
+goto copyAttribs; // Update secondary references
-m.setPlural(mv.isPlural());
-m.setUtf8(mv.isUtf8());
-m.setExtraComment(mv.extraComment());
 } else {
 // The virgin and vernacular sourceTexts are so
 // different that we could not find it.
-newType = TranslatorMessage::Obsolete;
+goto makeObsolete;
-if (m.type() != TranslatorMessage::Obsolete)
-obsoleted++;
-m.clearReferences();
 }
 }
 }
 } else {
-switch (m.type()) {
+mv = virginTor.message(mvi);
-case TranslatorMessage::Finished:
+if (!mv.id().isEmpty()
-default:
+&& (mv.context() != m.context()
-if (m.isPlural() == mv.isPlural()) {
+|| mv.sourceText() != m.sourceText()
-newType = TranslatorMessage::Finished;
+|| mv.comment() != m.comment())) {
-} else {
+known++;
+newType = TranslatorMessage::Unfinished;
+m.setContext(mv.context());
+m.setComment(mv.comment());
+if (mv.sourceText() != m.sourceText())
+goto outdateSource;
+} else {
+switch (m.type()) {
+case TranslatorMessage::Finished:
+default:
+if (m.isPlural() == mv.isPlural()) {
+newType = TranslatorMessage::Finished;
+} else {
+newType = TranslatorMessage::Unfinished;
+}
+known++;
+break;
+case TranslatorMessage::Unfinished:
 newType = TranslatorMessage::Unfinished;
+known++;
+break;
+case TranslatorMessage::Obsolete:
+newType = TranslatorMessage::Unfinished;
+neww++;
 }
-known++;
-break;
-case TranslatorMessage::Unfinished:
-newType = TranslatorMessage::Unfinished;
-known++;
-break;
-case TranslatorMessage::Obsolete:
-newType = TranslatorMessage::Unfinished;
-neww++;
 }
 // Always get the filename and linenumber info from the
 // virgin Translator, in case it has changed location.
 // This should also enable us to read a file that does not
 // have the <location> element.
 // why not use operator=()? Because it overwrites e.g. userData.
+copyAttribs:
 m.setReferences(mv.allReferences());
 m.setPlural(mv.isPlural());
 m.setUtf8(mv.isUtf8());
 m.setExtraComment(mv.extraComment());
+m.setId(mv.id());
 }
 }
 m.setType(newType);
 outTor.append(m);
 /*
 Messages found only in the virgin translator are added to the
 vernacular translator.
 */
 foreach (const TranslatorMessage &mv, virginTor.messages()) {
-if (mv.sourceText().isEmpty()) {
+if (mv.sourceText().isEmpty() && mv.id().isEmpty()) {
 if (tor.contains(mv.context()))
 continue;
 } else {
-if (tor.contains(mv.context(), mv.sourceText(), mv.comment()))
+if (tor.find(mv) >= 0)
 continue;
 if (options & HeuristicSimilarText) {
 TranslatorMessage m = tor.find(mv.context(), mv.comment(), mv.allReferences());
 if (!m.isNull()) {
 if (getSimilarityScore(m.sourceText(), mv.sourceText()) >= textSimilarityThreshold)
 }
 if (options & NoLocations)
 outTor.append(mv);
 else
 outTor.appendSorted(mv);
-if (!mv.sourceText().isEmpty())
+if (!mv.sourceText().isEmpty() || !mv.id().isEmpty())
 ++neww;
 }
 /*
 The same-text heuristic handles cases where a message has an

changeset 3	41300fa6a67c
parent 0	1918ee327afb
child 4	3b1da2848fc7