Changeset 2813

Timestamp:

07/01/08 00:23:09 (6 months ago)

Author:

edmanm

Message:

Fix po2ts so that it uses the same encoding to read in a .po file that it uses
to write out the .ts file. Also make the encoding used an optional parameter
that defaults to 'utf-8'.

Files:

• vidalia/trunk/src/tools/po2ts/po2ts.cpp (modified) (6 diffs)

vidalia/trunk/src/tools/po2ts/po2ts.cpp

@@ -13 +13 @@
 #include <QDomDocument>
 #include <QTextStream>
-
+#include <QTextCodec>
 
 #define TS_DOCTYPE                    "TS"
@@ -195 +195 @@
 {
   QTextStream error(stderr);
-  error << "usage: po2ts [-q] -i <infile.po> -o <outfile.ts>\n";
+  error << "usage: po2ts [-q] -i <infile.po> -o <outfile.ts> "
+           "[-c <encoding>]\n";
   error << "  -q (optional)   Quiet mode (errors are still displayed)\n";
   error << "  -i <infile.po>  Input .po file\n";
   error << "  -o <outfile.ts> Output .ts file\n";
+  error << "  -c <encoding>   Text encoding (default: utf-8)\n";
   error.flush();
   exit(1);
@@ -209 +211 @@
   QString errorMessage;
   char *infile, *outfile;
+  QTextCodec *codec = QTextCodec::codecForName("utf-8");
   bool quiet = false;
 
   /* Check for the correct number of input parameters. */
-  if (argc < 5 || argc > 6)
+  if (argc < 5 || argc > 8)
     print_usage_and_exit();
   for (int i = 1; i < argc; i++) {
@@ -222 +225 @@
     else if (!arg.compare("-o", Qt::CaseInsensitive) && ++i < argc)
       outfile = argv[i];
-    else
+    else if (!arg.compare("-c", Qt::CaseInsensitive) && ++i < argc) {
+      codec = QTextCodec::codecForName(argv[i]);
+      if (!codec) {
+        error << "Invalid text encoding specified\n";
+        return 1;
+      }
+    } else
       print_usage_and_exit(); 
   }
@@ -236 +245 @@
   QDomDocument ts;
   QTextStream po(&poFile);
+  po.setCodec(codec);
   int n_strings = po2ts(&po, &ts, &errorMessage);
   if (n_strings < 0) {
@@ -253 +263 @@
   /* Write the .ts output. */
   QTextStream out(&tsFile);
-  out.setCodec("UTF-8");
+  out.setCodec(codec);
+  out << QString("<?xml version=\"1.0\" encoding=\"%1\"?>\n")
+                                                  .arg(QString(codec->name()));
   out << ts.toString(4);