Changeset 2817 for vidalia/trunk/src

Timestamp:

07/02/08 01:16:49 (5 months ago)

Author:

edmanm

Message:

Modify ts2po to use a 'msgctxt' line for specifying a message's context,
rather than overloading the "#:" line (pootle > 1.0 supports msgctxt). Also
now use the "#:", as intended, for the string's filename and line number.

Location:

vidalia/trunk/src/tools/ts2po

Files:

• CMakeLists.txt (modified) (1 diff)
• ts2po.cpp (modified) (8 diffs)

vidalia/trunk/src/tools/ts2po/CMakeLists.txt

@@ -12 +12 @@
 
 ## Define this version of ts2po
-set(VERSION "0.1")
+set(VERSION "0.2")
 
 ## Include the source and binary directories so it can find out configured

vidalia/trunk/src/tools/ts2po/ts2po.cpp

@@ -10 +10 @@
 
 #include <QFile>
+#include <QFileInfo>
 #include <QDomDocument>
 #include <QTextStream>
@@ -23 +24 @@
 #define TS_ELEMENT_SOURCE             "source"
 #define TS_ELEMENT_TRANSLATION        "translation"
+#define TS_ELEMENT_LOCATION           "location"
+#define TS_ATTR_FILENAME              "filename"
+#define TS_ATTR_LINE                  "line"
 
 
@@ -41 +45 @@
   QString tstamp = create_po_timestamp();
 
-  header.append("#,fuzzy\n");
   header.append("msgid \"\"\n");
   header.append("msgstr \"\"\n");
@@ -61 +64 @@
 }
 
+/** Parse the filename from the relative or absolute path given in
+ * <b>filePath</b>. */
+QString
+parse_filename(const QString &filePath)
+{
+  QFileInfo file(filePath);
+  return file.fileName();
+}
+
 /** Convert the messages in <b>context</b> to PO format. The output will be
  * appended to <b>po</b>. Returns the number of source messages converted on
@@ -67 +79 @@
 convert_context(const QDomElement &context, QString *po, QString *errorMessage)
 {
-  QString msgid, msgstr;
+  QString msgctxt, msgid, msgstr;
+  QString filename, line;
   QDomElement location, source, translation;
   int n = 0;
@@ -80 +93 @@
     return -1;
   }
+  msgctxt = name.text();
 
   QDomElement msg = context.firstChildElement(TS_ELEMENT_MESSAGE);
@@ -102 +116 @@
     msgstr.replace("\n", "\"\n\"");
   
+    /* Try to extract the <location> tags (optional) */
+    location = msg.firstChildElement(TS_ELEMENT_LOCATION);
+    filename = parse_filename(location.attribute(TS_ATTR_FILENAME));
+    line = location.attribute(TS_ATTR_LINE);
+
     /* Format the .po entry for this string */
-    (*po).append(QString("#: %1#%2\n").arg(name.text()).arg(++n));
+    if (!filename.isEmpty() && !line.isEmpty())
+      (*po).append(QString("#: %1:%2\n").arg(filename).arg(line));
+    (*po).append(QString("msgctxt \"%1\"\n").arg(msgctxt));
     (*po).append(QString("msgid \"%1\"\n").arg(msgid));
     (*po).append(QString("msgstr \"%1\"\n").arg(msgstr));
@@ -110 +131 @@
     /* Find the next source message in the current context */
     msg = msg.nextSiblingElement(TS_ELEMENT_MESSAGE);
+    n++;
   }
   return n;