Changeset 561 for trunk/tools/linguist/lconvert/main.cpp

Timestamp:

Feb 11, 2010, 11:19:06 PM (15 years ago)

Author:

Dmitry A. Kuminov

Message:

trunk: Merged in qt 4.6.1 sources.

Location:

trunk

Files:

• . (modified) (1 prop)
• tools/linguist/lconvert/main.cpp (modified) (16 diffs)

trunk/tools/linguist/lconvert/main.cpp

@@ -2 +2 @@
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Qt Software Information (qt-info@nokia.com)
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the Qt Linguist of the Qt Toolkit.
@@ -21 +22 @@
 ** 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.0, included in the file LGPL_EXCEPTION.txt in this
-** package.
+** 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.
 **
 ** GNU General Public License Usage
@@ -34 +34 @@
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
-** If you are unsure which license is appropriate for your use, please
-** contact the sales department at qt-sales@nokia.com.
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 ** $QT_END_LICENSE$
 **
@@ -47 +47 @@
 #include <QtCore/QStringList>
 
+#include <iostream>
+
 static int usage(const QStringList &args)
 {
@@ -52 +54 @@
 
     QString loaders;
-    QString savers;
-    QString line = QString(QLatin1String("    %1 - %2\n"));
-    foreach (Translator::FileFormat format, Translator::registeredFileFormats()) {
+    QString line(QLatin1String("    %1 - %2\n"));
+    foreach (Translator::FileFormat format, Translator::registeredFileFormats())
         loaders += line.arg(format.extension, -5).arg(format.description);
-        if (format.fileType != Translator::FileFormat::SourceCode)
-            savers += line.arg(format.extension, -5).arg(format.description);
-    }
-
-    qWarning("%s", qPrintable(QString(QLatin1String("\nUsage:\n"
+
+    std::cerr << qPrintable(QString(QLatin1String("\nUsage:\n"
         "    lconvert [options] <infile> [<infile>...]\n\n"
         "lconvert is part of Qt's Linguist tool chain. It can be used as a\n"
-        "stand-alone tool to convert translation data files from one of the\n"
-        "following input formats\n\n%1\n"
-        "to one of the following output formats\n\n%2\n"
-        "If multiple input files are specified the translations are merged with\n"
+        "stand-alone tool to convert and filter translation data files.\n"
+        "The following file formats are supported:\n\n%1\n"
+        "If multiple input files are specified, they are merged with\n"
         "translations from later files taking precedence.\n\n"
         "Options:\n"
@@ -86 +83 @@
         "    --output-format <outformat>\n"
         "           Specify output format. See -if.\n\n"
+        "    --input-codec <codec>\n"
+        "           Specify encoding for QM and PO input files. Default is 'Latin1'\n"
+        "           for QM and 'UTF-8' for PO files. UTF-8 is always tried as well for\n"
+        "           QM, corresponding to the possible use of the trUtf8() function.\n\n"
+        "    --output-codec <codec>\n"
+        "           Specify encoding for PO output files. Default is 'UTF-8'.\n\n"
         "    --drop-tags <regexp>\n"
-        "           Drop named extra tags when writing 'ts' or 'xlf' files.\n"
+        "           Drop named extra tags when writing TS or XLIFF files.\n"
         "           May be specified repeatedly.\n\n"
         "    --drop-translations\n"
@@ -94 +97 @@
         "    --source-language <language>[_<region>]\n"
         "           Specify/override the language of the source strings. Defaults to\n"
-        "           POSIX if not specified and the file does not name it yet.\n"
+        "           POSIX if not specified and the file does not name it yet.\n\n"
         "    --target-language <language>[_<region>]\n"
         "           Specify/override the language of the translation.\n"
@@ -103 +106 @@
         "    --no-finished\n"
         "           Drop finished messages.\n\n"
+        "    --sort-contexts\n"
+        "           Sort contexts in output TS file alphabetically.\n\n"
+        "    --locations {absolute|relative|none}\n"
+        "           Override how source code references are saved in TS files.\n"
+        "           Default is absolute.\n\n"
+        "    --no-ui-lines\n"
+        "           Drop line numbers from references to UI files.\n\n"
         "    --verbose\n"
         "           be a bit more verbose\n\n"
@@ -110 +120 @@
         "    1 on command line parse failures\n"
         "    2 on read failures\n"
-        "    3 on write failures\n")).arg(loaders).arg(savers)));
+        "    3 on write failures\n")).arg(loaders));
     return 1;
 }
@@ -135 +145 @@
     bool noFinished = false;
     bool verbose = false;
+    bool noUiLines = false;
+    Translator::LocationsType locations = Translator::DefaultLocations;
 
     ConversionData cd;
@@ -165 +177 @@
                 return usage(args);
             inFormat = args[i];
+        } else if (args[i] == QLatin1String("-input-codec")) {
+            if (++i >= args.size())
+                return usage(args);
+            cd.m_codecForSource = args[i].toLatin1();
+        } else if (args[i] == QLatin1String("-output-codec")) {
+            if (++i >= args.size())
+                return usage(args);
+            cd.m_outputCodec = args[i].toLatin1();
         } else if (args[i] == QLatin1String("-drop-tag")) {
             if (++i >= args.size())
@@ -186 +206 @@
         } else if (args[i] == QLatin1String("-no-finished")) {
             noFinished = true;
+        } else if (args[i] == QLatin1String("-sort-contexts")) {
+            cd.m_sortContexts = true;
+        } else if (args[i] == QLatin1String("-locations")) {
+            if (++i >= args.size())
+                return usage(args);
+            if (args[i] == QLatin1String("none"))
+                locations = Translator::NoLocations;
+            else if (args[i] == QLatin1String("relative"))
+                locations = Translator::RelativeLocations;
+            else if (args[i] == QLatin1String("absolute"))
+                locations = Translator::AbsoluteLocations;
+            else
+                return usage(args);
+        } else if (args[i] == QLatin1String("-no-ui-lines")) {
+            noUiLines = true;
         } else if (args[i] == QLatin1String("-verbose")) {
             verbose = true;
@@ -202 +237 @@
 
     tr.setLanguageCode(Translator::guessLanguageCodeFromFileName(inFiles[0].name));
-    if (!targetLanguage.isEmpty())
-        tr.setLanguageCode(targetLanguage);
-    if (!sourceLanguage.isEmpty())
-        tr.setSourceLanguageCode(sourceLanguage);
 
     if (!tr.load(inFiles[0].name, cd, inFiles[0].format)) {
@@ -211 +242 @@
         return 2;
     }
-    Translator::reportDuplicates(tr.resolveDuplicates(), inFiles[0].name, verbose);
+    tr.reportDuplicates(tr.resolveDuplicates(), inFiles[0].name, verbose);
 
     for (int i = 1; i < inFiles.size(); ++i) {
@@ -219 +250 @@
             return 2;
         }
-        Translator::reportDuplicates(tr2.resolveDuplicates(), inFiles[i].name, verbose);
+        tr2.reportDuplicates(tr2.resolveDuplicates(), inFiles[i].name, verbose);
         for (int j = 0; j < tr2.messageCount(); ++j)
             tr.replaceSorted(tr2.message(j));
     }
 
+    if (!targetLanguage.isEmpty())
+        tr.setLanguageCode(targetLanguage);
+    if (!sourceLanguage.isEmpty())
+        tr.setSourceLanguageCode(sourceLanguage);
     if (noObsolete)
         tr.stripObsoleteMessages();
@@ -230 +265 @@
     if (dropTranslations)
         tr.dropTranslations();
-
+    if (noUiLines)
+        tr.dropUiLines();
+    if (locations != Translator::DefaultLocations)
+        tr.setLocationsType(locations);
+
+    tr.normalizeTranslations(cd);
+    if (!cd.errors().isEmpty()) {
+        qWarning("%s", qPrintable(cd.error()));
+        cd.clearErrors();
+    }
     if (!tr.save(outFileName, cd, outFormat)) {
         qWarning("%s", qPrintable(cd.error()));