FCL/sf/mw/qt: comparison tools/linguist/shared/po.cpp

equal deleted inserted replaced

-:5dc02b23752f
+:3e2da88830cd
 msg += '\n';
 }
 --l;
 }
+static void splitContext(QByteArray *comment, QByteArray *context)
+{
+char *data = comment->data();
+int len = comment->size();
+int sep = -1, j = 0;
+for (int i = 0; i < len; i++, j++) {
+if (data[i] == '~' && i + 1 < len)
+i++;
+else if (data[i] == '|')
+sep = j;
+data[j] = data[i];
+}
+if (sep >= 0) {
+QByteArray tmp = comment->mid(sep + 1, j - sep - 1);
+comment->truncate(sep);
+*context = *comment;
+*comment = tmp;
+} else {
+comment->truncate(j);
+}
+}
 static QString makePoHeader(const QString &str)
 {
 return QLatin1String("po-header-") + str.toLower().replace(QLatin1Char('-'), QLatin1Char('_'));
 }
 while (!dev.atEnd())
 lines.append(dev.readLine().trimmed());
 lines.append(QByteArray());
 int l = 0, lastCmtLine = -1;
+bool qtContexts = false;
 PoItem item;
 for (; l != lines.size(); ++l) {
 QByteArray line = lines.at(l);
 if (line.isEmpty())
 continue;
 foreach (const QByteArray &hdr, item.msgStr.first().split('\n')) {
 if (hdr.isEmpty())
 continue;
 int idx = hdr.indexOf(':');
 if (idx < 0) {
-cd.appendError(QString::fromLatin1("Unexpected PO header format '%1'\n")
+cd.appendError(QString::fromLatin1("Unexpected PO header format '%1'")
 .arg(QString::fromLatin1(hdr)));
 error = true;
 break;
 }
 QByteArray hdrName = hdr.left(idx).trimmed();
 hdrOrder << hdrName;
 if (hdrName == "X-Language") {
 translator.setLanguageCode(QString::fromLatin1(hdrValue));
 } else if (hdrName == "X-Source-Language") {
 translator.setSourceLanguageCode(QString::fromLatin1(hdrValue));
+} else if (hdrName == "X-Qt-Contexts") {
+qtContexts = (hdrValue == "true");
 } else if (hdrName == "Plural-Forms") {
 pluralForms  = hdrValue;
 } else if (hdrName == "MIME-Version") {
 // just assume it is 1.0
 } else if (hdrName == "Content-Type") {
 if (cd.m_codecForSource.isEmpty()) {
 if (!hdrValue.startsWith("text/plain; charset=")) {
-cd.appendError(QString::fromLatin1("Unexpected Content-Type header '%1'\n")
+cd.appendError(QString::fromLatin1("Unexpected Content-Type header '%1'")
 .arg(QString::fromLatin1(hdrValue)));
 error = true;
 // This will avoid a flood of conversion errors.
 codec = QTextCodec::codecForName("latin1");
 } else {
 QByteArray cod = hdrValue.mid(20);
 QTextCodec *cdc = QTextCodec::codecForName(cod);
 if (!cdc) {
-cd.appendError(QString::fromLatin1("Unsupported codec '%1'\n")
+cd.appendError(QString::fromLatin1("Unsupported codec '%1'")
 .arg(QString::fromLatin1(cod)));
 error = true;
 // This will avoid a flood of conversion errors.
 codec = QTextCodec::codecForName("latin1");
 } else {
 }
 }
 }
 } else if (hdrName == "Content-Transfer-Encoding") {
 if (hdrValue != "8bit") {
-cd.appendError(QString::fromLatin1("Unexpected Content-Transfer-Encoding '%1'\n")
+cd.appendError(QString::fromLatin1("Unexpected Content-Transfer-Encoding '%1'")
 .arg(QString::fromLatin1(hdrValue)));
 return false;
 }
 } else if (hdrName == "X-Virgin-Header") {
 // legacy
 }
 // Eliminate the field if only headers we added are present in standard order.
 // Keep in sync with savePO
 static const char * const dfltHdrs[] = {
 "MIME-Version", "Content-Type", "Content-Transfer-Encoding",
-"Plural-Forms", "X-Language", "X-Source-Language"
+"Plural-Forms", "X-Language", "X-Source-Language", "X-Qt-Contexts"
 };
 uint cdh = 0;
 for (int cho = 0; cho < hdrOrder.length(); cho++) {
 for (;; cdh++) {
 if (cdh == sizeof(dfltHdrs)/sizeof(dfltHdrs[0])) {
 break;
 case ' ':
 slurpComment(item.translatorComments, lines, l);
 break;
 case '.':
-if (line.startsWith("#. ts-context ")) {
+if (line.startsWith("#. ts-context ")) { // legacy
 item.context = line.mid(14);
 } else if (line.startsWith("#. ts-id ")) {
 item.id = line.mid(9);
 } else {
 item.automaticComments += line.mid(3);
 if (extra != item.oldMsgId)
 item.extra[QLatin1String("po-old_msgid_plural")] =
 codec->toUnicode(extra);
 } else if (line.startsWith("#| msgctxt ")) {
 item.oldTscomment = slurpEscapedString(lines, l, 11, "#| ", cd);
+if (qtContexts)
+splitContext(&item.oldTscomment, &item.context);
 } else {
-cd.appendError(QString(QLatin1String("PO-format parse error in line %1: '%2'\n"))
+cd.appendError(QString(QLatin1String("PO-format parse error in line %1: '%2'"))
 .arg(l + 1).arg(codec->toUnicode(lines[l])));
 error = true;
 }
 break;
 case '~':
 codec->toUnicode(extra);
 item.isPlural = true;
 } else if (line.startsWith("#~ msgctxt ")) {
 item.tscomment = slurpEscapedString(lines, l, 11, "#~ ", cd);
 } else {
-cd.appendError(QString(QLatin1String("PO-format parse error in line %1: '%2'\n"))
+cd.appendError(QString(QLatin1String("PO-format parse error in line %1: '%2'"))
 .arg(l + 1).arg(codec->toUnicode(lines[l])));
 error = true;
 }
 break;
 default:
-cd.appendError(QString(QLatin1String("PO-format parse error in line %1: '%2'\n"))
+cd.appendError(QString(QLatin1String("PO-format parse error in line %1: '%2'"))
 .arg(l + 1).arg(codec->toUnicode(lines[l])));
 error = true;
 break;
 }
 lastCmtLine = l;
 } else if (line.startsWith("msgctxt ")) {
 item.tscomment = slurpEscapedString(lines, l, 8, QByteArray(), cd);
+if (qtContexts)
+splitContext(&item.tscomment, &item.context);
 } else if (line.startsWith("msgid ")) {
 item.msgId = slurpEscapedString(lines, l, 6, QByteArray(), cd);
 } else if (line.startsWith("msgid_plural ")) {
 QByteArray extra = slurpEscapedString(lines, l, 13, QByteArray(), cd);
 if (extra != item.msgId)
 item.extra[QLatin1String("po-msgid_plural")] = codec->toUnicode(extra);
 item.isPlural = true;
 } else {
-cd.appendError(QString(QLatin1String("PO-format error in line %1: '%2'\n"))
+cd.appendError(QString(QLatin1String("PO-format error in line %1: '%2'"))
 .arg(l + 1).arg(codec->toUnicode(lines[l])));
 error = true;
 }
 }
 return !error && cd.errors().isEmpty();
 if (!hdrOrder.contains(qName))
 hdrOrder << qName;
 headers[makePoHeader(qName)] = value;
 }
+static QString escapeComment(const QString &in, bool escape)
+{
+QString out = in;
+if (escape) {
+out.replace(QLatin1Char('~'), QLatin1String("~~"));
+out.replace(QLatin1Char('|'), QLatin1String("~|"));
+}
+return out;
+}
 bool savePO(const Translator &translator, QIODevice &dev, ConversionData &cd)
 {
 QString str_format = QLatin1String("-format");
 bool ok = true;
 QTextStream out(&dev);
 out.setCodec(cd.m_outputCodec.isEmpty() ? QByteArray("UTF-8") : cd.m_outputCodec);
+bool qtContexts = false;
+foreach (const TranslatorMessage &msg, translator.messages())
+if (!msg.context().isEmpty()) {
+qtContexts = true;
+break;
+}
 QString cmt = translator.extra(QLatin1String("po-header_comment"));
 if (!cmt.isEmpty())
 out << cmt << '\n';
 out << "msgid \"\"\n";
 addPoHeader(headers, hdrOrder, "Plural-Forms", QLatin1String(gettextRules));
 addPoHeader(headers, hdrOrder, "X-Language", translator.languageCode());
 }
 if (!translator.sourceLanguageCode().isEmpty())
 addPoHeader(headers, hdrOrder, "X-Source-Language", translator.sourceLanguageCode());
+if (qtContexts)
+addPoHeader(headers, hdrOrder, "X-Qt-Contexts", QLatin1String("true"));
 QString hdrStr;
 foreach (const QString &hdr, hdrOrder) {
 hdrStr += hdr;
 hdrStr += QLatin1String(": ");
 hdrStr += headers.value(makePoHeader(hdr));
 out << poEscapedLines(QLatin1String("#"), true, msg.translatorComment());
 if (!msg.extraComment().isEmpty())
 out << poEscapedLines(QLatin1String("#."), true, msg.extraComment());
-if (!msg.context().isEmpty())
-out << QLatin1String("#. ts-context ") << msg.context() << '\n';
 if (!msg.id().isEmpty())
 out << QLatin1String("#. ts-id ") << msg.id() << '\n';
 if (!msg.fileName().isEmpty() && msg.fileName() != QLatin1String(MAGIC_OBSOLETE_REFERENCE)) {
 QStringList refs;
 if (!flags.isEmpty())
 out << "#, " << flags.join(QLatin1String(", ")) << '\n';
 QString prefix = QLatin1String("#| ");
 if (!msg.oldComment().isEmpty())
-out << poEscapedString(prefix, QLatin1String("msgctxt"), noWrap, msg.oldComment());
+out << poEscapedString(prefix, QLatin1String("msgctxt"), noWrap,
+escapeComment(msg.oldComment(), qtContexts));
 if (!msg.oldSourceText().isEmpty())
 out << poEscapedString(prefix, QLatin1String("msgid"), noWrap, msg.oldSourceText());
 QString plural = msg.extra(QLatin1String("po-old_msgid_plural"));
 if (!plural.isEmpty())
 out << poEscapedString(prefix, QLatin1String("msgid_plural"), noWrap, plural);
 prefix = QLatin1String((msg.type() == TranslatorMessage::Obsolete) ? "#~ " : "");
-if (!msg.comment().isEmpty())
+if (!msg.context().isEmpty())
-out << poEscapedString(prefix, QLatin1String("msgctxt"), noWrap, msg.comment());
+out << poEscapedString(prefix, QLatin1String("msgctxt"), noWrap,
+escapeComment(msg.context(), true) + QLatin1Char('|')
++ escapeComment(msg.comment(), true));
+else if (!msg.comment().isEmpty())
+out << poEscapedString(prefix, QLatin1String("msgctxt"), noWrap,
+escapeComment(msg.comment(), qtContexts));
 out << poEscapedString(prefix, QLatin1String("msgid"), noWrap, msg.sourceText());
 if (!msg.isPlural()) {
 QString transl = msg.translation();
 transl.replace(QChar(Translator::BinaryVariantSeparator),
 QChar(Translator::TextVariantSeparator));

changeset 33	3e2da88830cd
parent 30	5dc02b23752f
child 37	758a864f9613