Initial import from the monolithic Qt.

This is the beginning of revision history for this module. If you
want to look at revision history older than this, please refer to the
Qt Git wiki for how to use Git history grafting. At the time of
writing, this wiki is located here:

http://qt.gitorious.org/qt/pages/GitIntroductionWithQt

If you have already performed the grafting and you don't see any
history beyond this commit, try running "git log" with the "--follow"
argument.

Branched from the monolithic repo, Qt master branch, at commit
896db169ea224deb96c59ce8af800d019de63f12

10 files changed, 523 insertions, 0 deletions

diff --git a/tests/auto/linguist/lrelease/.gitignore b/tests/auto/linguist/lrelease/.gitignore
new file mode 100644
index 000000000..cf7059c4b
--- /dev/null
+++ b/tests/auto/linguist/lrelease/.gitignore
@@ -0,0 +1,2 @@
+tst_lrelease
+testdata/*.qm
diff --git a/tests/auto/linguist/lrelease/lrelease.pro b/tests/auto/linguist/lrelease/lrelease.pro
new file mode 100644
index 000000000..8006042c3
--- /dev/null
+++ b/tests/auto/linguist/lrelease/lrelease.pro
@@ -0,0 +1,5 @@
+CONFIG += qttest_p4
+CONFIG -= gui
+TARGET = tst_lrelease
+
+SOURCES += tst_lrelease.cpp
diff --git a/tests/auto/linguist/lrelease/testdata/compressed.ts b/tests/auto/linguist/lrelease/testdata/compressed.ts
new file mode 100644
index 000000000..957926995
--- /dev/null
+++ b/tests/auto/linguist/lrelease/testdata/compressed.ts
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.0">
+<context>
+    <name>Context1</name>
+    <message>
+        <source>Foo</source>
+        <translation>in first context</translation>
+    </message>
+</context>
+<context>
+    <name>Context2</name>
+    <message>
+        <source>Bar</source>
+        <translation>in second context</translation>
+    </message>
+</context>
+<context>
+    <name>Action1</name>
+    <message>
+        <location filename="main.cpp" line="14"/>
+        <source>Component Name</source>
+        <translation>translation in first context</translation>
+    </message>
+    <message>
+        <source>Fooish bar</source>
+        <translation>the bar is fooish</translation>
+    </message>
+</context>
+<context>
+    <name>Action2</name>
+    <message>
+        <location filename="main.cpp" line="20"/>
+        <source>Component Name</source>
+        <translation>translation in second context</translation>
+    </message>
+</context>
+<context>
+    <name>Action3</name>
+    <message>
+        <location filename="main.cpp" line="26"/>
+        <source>Component Name</source>
+        <translation>translation in third context</translation>
+    </message>
+</context>
+</TS>
diff --git a/tests/auto/linguist/lrelease/testdata/dupes.errors b/tests/auto/linguist/lrelease/testdata/dupes.errors
new file mode 100644
index 000000000..74fcbbb43
--- /dev/null
+++ b/tests/auto/linguist/lrelease/testdata/dupes.errors
@@ -0,0 +1,4 @@
+Warning: dropping duplicate messages in 'testdata/dupes\.qm':
+
+\* Context: FindDialog
+\* Source: Text not found
diff --git a/tests/auto/linguist/lrelease/testdata/dupes.ts b/tests/auto/linguist/lrelease/testdata/dupes.ts
new file mode 100644
index 000000000..ec368c327
--- /dev/null
+++ b/tests/auto/linguist/lrelease/testdata/dupes.ts
@@ -0,0 +1,25 @@
+<?xml version="1.0"?>
+<!DOCTYPE TS>
+<TS version="1.1">
+<context>
+    <name>FindDialog</name>
+    <message utf8="true">
+        <source>Search reached start of the document</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="finddialog.cpp" line="109"/>
+        <source>Search reached start of the document</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="finddialog.cpp" line="111"/>
+        <source>Text not found</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Text not found</source>
+        <translation type="obsolete"></translation>
+    </message>
+</context>
+</TS>
diff --git a/tests/auto/linguist/lrelease/testdata/idbased.ts b/tests/auto/linguist/lrelease/testdata/idbased.ts
new file mode 100644
index 000000000..c7555c846
--- /dev/null
+++ b/tests/auto/linguist/lrelease/testdata/idbased.ts
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.0">
+<context>
+    <name></name>
+    <message id="test_id">
+        <source>Completely irrelevant source text</source>
+        <translation>This is a test string.</translation>
+    </message>
+    <message id="untranslated_id">
+        <source>This has no translation.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message id="this_another_id">
+        <source>Foo bar.</source>
+        <comment>Warn me!</comment>
+    </message>
+    <message>
+        <source>Drop me!</source>
+    </message>
+    <message id="one_id">
+        <source></source>
+    </message>
+    <message id="two_id">
+        <source></source>
+    </message>
+</context>
+</TS>
diff --git a/tests/auto/linguist/lrelease/testdata/mixedcodecs-ts11.ts b/tests/auto/linguist/lrelease/testdata/mixedcodecs-ts11.ts
new file mode 100644
index 000000000..991f35432
--- /dev/null
+++ b/tests/auto/linguist/lrelease/testdata/mixedcodecs-ts11.ts
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="1.1">
+<defaultcodec>windows-1252</defaultcodec>
+<context>
+    <name>FooBar</name>
+    <message>
+        <location filename="main.cpp" line="11"/>
+        <source>this contains an umlaut &#xfc; &amp;uuml;</source>
+        <translation>random stuff with umlaut</translation>
+    </message>
+    <message encoding="UTF-8">
+        <location filename="main.cpp" line="13"/>
+        <source>umlaut ü &amp;uuml; in utf8</source>
+        <translation>more random stuff with umlaut</translation>
+    </message>
+</context>
+</TS>
diff --git a/tests/auto/linguist/lrelease/testdata/mixedcodecs-ts20.ts b/tests/auto/linguist/lrelease/testdata/mixedcodecs-ts20.ts
new file mode 100644
index 000000000..8bb56d43f
--- /dev/null
+++ b/tests/auto/linguist/lrelease/testdata/mixedcodecs-ts20.ts
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.0">
+<defaultcodec>windows-1252</defaultcodec>
+<context>
+    <name>FooBar</name>
+    <message>
+        <location filename="main.cpp" line="11"/>
+        <source>this contains an umlaut ü &amp;uuml;</source>
+        <translation>random stuff with umlaut</translation>
+    </message>
+    <message utf8="true">
+        <location filename="main.cpp" line="13"/>
+        <source>umlaut ü &amp;uuml; in utf8</source>
+        <translation>more random stuff with umlaut</translation>
+    </message>
+</context>
+</TS>
diff --git a/tests/auto/linguist/lrelease/testdata/translate.ts b/tests/auto/linguist/lrelease/testdata/translate.ts
new file mode 100644
index 000000000..ad3015d32
--- /dev/null
+++ b/tests/auto/linguist/lrelease/testdata/translate.ts
@@ -0,0 +1,136 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="1.1" language="en">
+<context>
+    <name></name>
+    <message>
+        <location filename="tst_lrelease.cpp" line="32"/>
+        <source>Test</source>
+        <translation>AAAA</translation>
+        <comment>Empty context</comment>
+    </message>
+</context>
+<context>
+    <name>CubeForm</name>
+    <message>
+        <location filename="tst_lrelease.cpp" line="31"/>
+        <source>Test</source>
+        <translation>BBBB</translation>
+    </message>
+</context>
+<context>
+    <name>QObject</name>
+    <message>
+        <location filename="tst_lrelease.cpp" line="22"/>
+        <source>
+newline at the start</source>
+        <translation>
+NEWLINE AT THE START</translation>
+    </message>
+    <message>
+        <location filename="tst_lrelease.cpp" line="23"/>
+        <source>newline at the end
+</source>
+        <translation>NEWLINE AT THE END
+</translation>
+    </message>
+    <message>
+        <location filename="tst_lrelease.cpp" line="24"/>
+        <source>newline and space at the end
+ </source>
+        <translation>NEWLINE AND SPACE AT THE END
+ </translation>
+    </message>
+    <message>
+        <location filename="tst_lrelease.cpp" line="25"/>
+        <source>space and newline at the end 
+</source>
+        <translation>SPACE AND NEWLINE AT THE END 
+</translation>
+    </message>
+    <message>
+        <location filename="tst_lrelease.cpp" line="26"/>
+        <source><byte value="x9"/>tab at the start and newline at the end
+</source>
+        <translation><byte value="x9"/>TAB AT THE START AND NEWLINE AT THE END
+</translation>
+    </message>
+    <message>
+        <location filename="tst_lrelease.cpp" line="27"/>
+        <source>
+<byte value="x9"/>newline and tab at the start</source>
+        <translation>
+<byte value="x9"/>NEWLINE AND TAB AT THE START</translation>
+    </message>
+    <message>
+        <location filename="tst_lrelease.cpp" line="28"/>
+        <source> <byte value="x9"/>space and tab at the start</source>
+        <translation> <byte value="x9"/>SPACE AND TAB AT THE START</translation>
+    </message>
+    <message>
+        <location filename="tst_lrelease.cpp" line="29"/>
+        <source> space first</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="tst_lrelease.cpp" line="29"/>
+        <source> string that does not exist</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>Plurals</name>
+    <message numerus="yes">
+        <location filename="tst_lrelease.cpp" line="35"/>
+        <source>There are %n houses</source>
+        <translation>
+            <numerusform>There is %n house</numerusform>
+            <numerusform>There are %n houses</numerusform>
+        </translation>
+    </message>
+</context>
+<context>
+    <name>tst_lrelease</name>
+    <message numerus="yes">
+        <location filename="tst_lrelease.cpp" line="43"/>
+        <source>There are %n cars</source>
+        <comment>More Plurals</comment>
+        <translation>
+            <numerusform>There is %n car</numerusform>
+            <numerusform>There are %n cars</numerusform>
+        </translation>
+    </message>
+    <message>
+        <source>Completely random string</source>
+        <translation variants="yes">
+            <lengthvariant>Super-lange Uebersetzung mit Schikanen</lengthvariant>
+            <lengthvariant>Mittlere Uebersetung</lengthvariant>
+            <lengthvariant>Kurze Uebers.</lengthvariant>
+        </translation>
+    </message>
+</context>
+<context>
+    <name>no_en</name>
+    <message>
+        <location filename="tst_lrelease.cpp" line="49"/>
+        <source>Kj&#xf8;r K&#xe5;re, kj&#xe6;re</source>
+        <translation>Drive K&#xe5;re, dear</translation>
+    </message>
+</context>
+<context>
+    <name>en_no</name>
+    <message>
+        <location filename="tst_lrelease.cpp" line="50"/>
+        <source>Drive K&#xe5;re, dear</source>
+        <translation>Kj&#xf8;r K&#xe5;re, kj&#xe6;re</translation>
+    </message>
+</context>
+<context>
+    <name>en_ch</name>
+    <message>
+        <location filename="tst_lrelease.cpp" line="51"/>
+        <source>Chinese symbol:</source>
+        <translation>Chinese symbol:&#x7c1f;</translation>
+    </message>
+</context>
+</TS>
diff --git a/tests/auto/linguist/lrelease/tst_lrelease.cpp b/tests/auto/linguist/lrelease/tst_lrelease.cpp
new file mode 100644
index 000000000..8ec90571d
--- /dev/null
+++ b/tests/auto/linguist/lrelease/tst_lrelease.cpp
@@ -0,0 +1,241 @@
+/****************************************************************************
+**
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the Qt Linguist of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtCore/QDir>
+#include <QtCore/QDebug>
+#include <QtCore/QFile>
+#include <QtCore/QByteArray>
+
+#include <QtTest/QtTest>
+
+class tst_lrelease : public QObject
+{
+    Q_OBJECT
+
+public:
+    tst_lrelease() : binDir(QLibraryInfo::location(QLibraryInfo::BinariesPath)) {}
+
+private:
+
+private slots:
+    void translate();
+    void mixedcodecs();
+    void compressed();
+    void idbased();
+    void markuntranslated();
+    void dupes();
+
+private:
+    void doCompare(const QStringList &actual, const QString &expectedFn);
+
+    QString binDir;
+};
+
+void tst_lrelease::doCompare(const QStringList &actual, const QString &expectedFn)
+{
+    QFile file(expectedFn);
+    QVERIFY(file.open(QIODevice::ReadOnly | QIODevice::Text));
+    QStringList expected = QString(file.readAll()).trimmed().split('\n');
+
+    int i = 0, ei = expected.size(), gi = actual.size();
+    for (; ; i++) {
+        if (i == gi) {
+            if (i == ei)
+                return;
+            gi = 0;
+            break;
+        } else if (i == ei) {
+            ei = 0;
+            break;
+        } else if (!QRegExp(expected.at(i)).exactMatch(actual.at(i))) {
+            while ((ei - 1) >= i && (gi - 1) >= i &&
+                     (QRegExp(expected.at(ei - 1)).exactMatch(actual.at(gi - 1))))
+                ei--, gi--;
+            break;
+        }
+    }
+    QByteArray diff;
+    for (int j = qMax(0, i - 3); j < i; j++)
+        diff += expected.at(j) + '\n';
+    diff += "<<<<<<< got\n";
+    for (int j = i; j < gi; j++) {
+        diff += actual.at(j) + '\n';
+        if (j >= i + 5) {
+            diff += "...\n";
+            break;
+        }
+    }
+    diff += "=========\n";
+    for (int j = i; j < ei; j++) {
+        diff += expected.at(j) + '\n';
+        if (j >= i + 5) {
+            diff += "...\n";
+            break;
+        }
+    }
+    diff += ">>>>>>> expected\n";
+    for (int j = ei; j < qMin(ei + 3, expected.size()); j++)
+        diff += expected.at(j) + '\n';
+    QFAIL(qPrintable("Output for " + expectedFn + " does not meet expectations:\n" + diff));
+}
+
+void tst_lrelease::translate()
+{
+    QVERIFY(!QProcess::execute(binDir + "/lrelease testdata/translate.ts"));
+
+    QTranslator translator;
+    QVERIFY(translator.load("testdata/translate.qm"));
+    qApp->installTranslator(&translator);
+
+    QCOMPARE(QObject::tr("\nnewline at the start"), QString("\nNEWLINE AT THE START"));
+    QCOMPARE(QObject::tr("newline at the end\n"),   QString("NEWLINE AT THE END\n"));
+    QCOMPARE(QObject::tr("newline and space at the end\n "),   QString("NEWLINE AND SPACE AT THE END\n "));
+    QCOMPARE(QObject::tr("space and newline at the end \n"),   QString("SPACE AND NEWLINE AT THE END \n"));
+    QCOMPARE(QObject::tr("\ttab at the start and newline at the end\n"),   QString("\tTAB AT THE START AND NEWLINE AT THE END\n"));
+    QCOMPARE(QObject::tr("\n\tnewline and tab at the start"), QString("\n\tNEWLINE AND TAB AT THE START"));
+    QCOMPARE(QObject::tr(" \tspace and tab at the start"), QString(" \tSPACE AND TAB AT THE START"));
+    QCOMPARE(QObject::tr(" string that does not exist"), QString(" string that does not exist"));
+
+    QCOMPARE(QCoreApplication::translate("CubeForm", "Test"), QString::fromAscii("BBBB"));
+    QCOMPARE(QCoreApplication::translate("", "Test", "Empty context"), QString("AAAA"));
+
+    // Test plurals
+    QString txed = QCoreApplication::translate("Plurals", "There are %n houses", 0, QCoreApplication::UnicodeUTF8, 0);
+    QCOMPARE(QString::fromAscii("[%1]").arg(txed), QString("[There are 0 houses]"));
+    QCOMPARE(QCoreApplication::translate("Plurals", "There are %n houses", 0, QCoreApplication::UnicodeUTF8, 1), QString("There is 1 house"));
+    QCOMPARE(QCoreApplication::translate("Plurals", "There are %n houses", 0, QCoreApplication::UnicodeUTF8, 2), QString("There are 2 houses"));
+    QCOMPARE(QCoreApplication::translate("Plurals", "There are %n houses", 0, QCoreApplication::UnicodeUTF8, 3), QString("There are 3 houses"));
+
+
+    // More plurals
+    QCOMPARE(tr("There are %n cars", "More Plurals", 0) , QString("There are 0 cars"));
+    QCOMPARE(tr("There are %n cars", "More Plurals", 1) , QString("There is 1 car"));
+    QCOMPARE(tr("There are %n cars", "More Plurals", 2) , QString("There are 2 cars"));
+    QCOMPARE(tr("There are %n cars", "More Plurals", 3) , QString("There are 3 cars"));
+
+
+    QCOMPARE(QCoreApplication::translate("no_en", "Kj\370r K\345re, kj\346re"), QString::fromAscii("Drive K\345re, dear"));
+    QCOMPARE(QCoreApplication::translate("en_no", "Drive K\345re, dear"), QString::fromAscii("Kj\370r K\345re, kj\346re"));
+    QCOMPARE(QCoreApplication::translate("en_ch", "Chinese symbol:"), QString::fromAscii("Chinese symbol:%1").arg(QChar(0x7c1f)));
+
+//    printf("halo\r\nhallo");
+  //  QCOMPARE(tr("This\r\nwill fail"), QString("THIS\nWILL FAIL"));    // \r\n =  0d 0a
+
+    QCOMPARE(tr("Completely random string"),
+             QString::fromLatin1("Super-lange Uebersetzung mit Schikanen\x9c"
+                                 "Mittlere Uebersetung\x9c"
+                                 "Kurze Uebers."));
+
+    qApp->removeTranslator(&translator);
+}
+
+void tst_lrelease::mixedcodecs()
+{
+    QVERIFY(!QProcess::execute(binDir + "/lrelease testdata/mixedcodecs-ts11.ts"));
+    QVERIFY(!QProcess::execute(binDir + "/lrelease testdata/mixedcodecs-ts20.ts"));
+#ifdef Q_OS_WIN
+    QVERIFY(!QProcess::execute("fc /b testdata\\mixedcodecs-ts11.qm testdata\\mixedcodecs-ts20.qm"));
+#else
+    QVERIFY(!QProcess::execute("cmp testdata/mixedcodecs-ts11.qm testdata/mixedcodecs-ts20.qm"));
+#endif
+
+    QTranslator translator;
+    QVERIFY(translator.load("testdata/mixedcodecs-ts11.qm"));
+    qApp->installTranslator(&translator);
+
+    QCOMPARE(QCoreApplication::translate("FooBar", "this contains an umlaut \xfc &uuml;"),
+             QString::fromAscii("random stuff with umlaut"));
+    QCOMPARE(QCoreApplication::translate("FooBar", "umlaut \xc3\xbc &uuml; in utf8"),
+             QString::fromAscii("more random stuff with umlaut"));
+}
+
+void tst_lrelease::compressed()
+{
+    QVERIFY(!QProcess::execute(binDir + "/lrelease -compress testdata/compressed.ts"));
+
+    QTranslator translator;
+    QVERIFY(translator.load("testdata/compressed.qm"));
+    qApp->installTranslator(&translator);
+
+    QCOMPARE(QCoreApplication::translate("Context1", "Foo"), QString::fromAscii("in first context"));
+    QCOMPARE(QCoreApplication::translate("Context2", "Bar"), QString::fromAscii("in second context"));
+
+    QCOMPARE(QCoreApplication::translate("Action1", "Component Name"), QString::fromAscii("translation in first context"));
+    QCOMPARE(QCoreApplication::translate("Action2", "Component Name"), QString::fromAscii("translation in second context"));
+    QCOMPARE(QCoreApplication::translate("Action3", "Component Name"), QString::fromAscii("translation in third context"));
+
+}
+
+void tst_lrelease::idbased()
+{
+    QVERIFY(!QProcess::execute(binDir + "/lrelease -idbased testdata/idbased.ts"));
+
+    QTranslator translator;
+    QVERIFY(translator.load("testdata/idbased.qm"));
+    qApp->installTranslator(&translator);
+
+    QCOMPARE(qtTrId("test_id"), QString::fromAscii("This is a test string."));
+    QCOMPARE(qtTrId("untranslated_id"), QString::fromAscii("This has no translation."));
+}
+
+void tst_lrelease::markuntranslated()
+{
+    QVERIFY(!QProcess::execute(binDir + "/lrelease -markuntranslated # -idbased testdata/idbased.ts"));
+
+    QTranslator translator;
+    QVERIFY(translator.load("testdata/idbased.qm"));
+    qApp->installTranslator(&translator);
+
+    QCOMPARE(qtTrId("test_id"), QString::fromAscii("This is a test string."));
+    QCOMPARE(qtTrId("untranslated_id"), QString::fromAscii("#This has no translation."));
+}
+
+void tst_lrelease::dupes()
+{
+    QProcess proc;
+    proc.start(binDir + "/lrelease testdata/dupes.ts", QIODevice::ReadWrite | QIODevice::Text);
+    QVERIFY(proc.waitForFinished());
+    QVERIFY(proc.exitStatus() == QProcess::NormalExit);
+    doCompare(QString(proc.readAllStandardError()).trimmed().split('\n'), "testdata/dupes.errors");
+}
+
+QTEST_MAIN(tst_lrelease)
+#include "tst_lrelease.moc"