Remove remaining bits from standalone xml2po, fix tests, fix bug #381607.

8 files changed, 31 insertions, 73 deletions

diff --git a/xml2po/ChangeLog b/xml2po/ChangeLog
index ed468a8..ff6f601 100644
--- a/xml2po/ChangeLog
+++ b/xml2po/ChangeLog
@@ -1,3 +1,17 @@
+2006-12-26  Danilo Šegan  <danilo@gnome.org>
+
+	* xml2po.py: Update copyright notice.
+
+	* Makefile.am (xml2po): Remove configure.ac dependency.
+	* autogen.sh, configure.ac: Removed.
+
+2006-12-26  Danilo Šegan  <danilo@gnome.org>
+
+	Fix bug #381607.
+
+	* xml2po.py (MessageOutput.outputAll): Ignore untranslated
+	messages in -r (reuse) mode.
+
 2006-10-20  Danilo Šegan  <danilo@gnome.org>
 
 	* xml2po.py: Improve speed with Alexander Nedotsukov's patch from
diff --git a/xml2po/Makefile.am b/xml2po/Makefile.am
index 099b4b9..bb64556 100644
--- a/xml2po/Makefile.am
+++ b/xml2po/Makefile.am
@@ -10,7 +10,7 @@ pkgconfig_DATA = xml2po.pc
 
 man_MANS = xml2po.1
 
-xml2po: xml2po.py configure.ac
+xml2po: xml2po.py
 	sed -e "s/^VERSION =.*/VERSION = \"@VERSION@\"/" \
 	    -e "s+^submodes_path =.*+submodes_path = \"$(commondir)\"+" \
 	    -e "s+^#!.*python.*+#!$(PYTHON)+" \
diff --git a/xml2po/autogen.sh b/xml2po/autogen.sh
deleted file mode 100755
index 425f473..0000000
--- a/xml2po/autogen.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/sh
-aclocal
-autoconf
-automake --add-missing
-./configure $*
diff --git a/xml2po/configure.ac b/xml2po/configure.ac
deleted file mode 100644
index a02a3ae..0000000
--- a/xml2po/configure.ac
+++ /dev/null
@@ -1,59 +0,0 @@
-AC_INIT(xml2po.py)
-
-dnl 
-AM_INIT_AUTOMAKE(xml2po, 1.0.11)
-
-dnl Default to same installation prefix as intltool
-AC_PREFIX_PROGRAM(intltool-update)
-
-AC_PROG_INSTALL
-
-dnl Test for Python: not sure about the version, tested with 2.2.1
-AM_PATH_PYTHON([2.0])
-
-dnl I'm not sure about the version, tested with 2.5.11 and 2.6.*
-LIBXML_REQUIRED=2.5.11
-
-dnl Check pkg-config is installed ("borrowed" from shared-mime-info)
-if test -z "$PKG_CONFIG"; then
-  PKG_CONFIG=pkg-config
-fi
-AC_SUBST(PKG_CONFIG)
-
-AC_MSG_CHECKING(that pkg-config runs)
-if "$PKG_CONFIG" --version > /dev/null 2>&1 ; then
-  AC_MSG_RESULT(yes)
-else
-  AC_MSG_RESULT(no)
-  AC_MSG_ERROR([*** $PKG_CONFIG missing ***
-
-\'$PKG_CONFIG --version\' failed to run - make sure it is inside one of the
-directories in your PATH environment variable!
-
-pkg-config is available from this web page:
-
-http://www.freedesktop.org/software/pkgconfig
-])
-fi
-
-
-AC_DEFUN(REQUIRE, [
-AC_MSG_CHECKING(that $1 (version >= $2) is installed)
-if "$PKG_CONFIG" --atleast-version=$2 $1 ; then
-  AC_MSG_RESULT(yes)
-else
-  AC_MSG_RESULT(no)
-  if "$PKG_CONFIG" --exists $1 ; then
-    AC_MSG_ERROR(Current version is only `"$PKG_CONFIG" "$1" --modversion`)
-  else
-    AC_MSG_ERROR(Package is not installed)
-  fi
-fi
-])
-
-dnl Check for libxml
-REQUIRE(libxml-2.0, $LIBXML_REQUIRED)
-
-dnl PKG_CHECK_MODULES(XML2PO, libxml-2.0 >= $LIBXML_REQUIRED)
-
-AC_OUTPUT([Makefile xml2po.pc modes/Makefile examples/Makefile])
diff --git a/xml2po/tests/ChangeLog b/xml2po/tests/ChangeLog
index 991728e..970aca5 100644
--- a/xml2po/tests/ChangeLog
+++ b/xml2po/tests/ChangeLog
@@ -1,3 +1,8 @@
+2006-12-26  Danilo Šegan  <danilo@gnome.org>
+
+	* ubuntu-mode.xml.out: Set language where appropriate.
+	* ubuntu-mode.pot: Fixed to reflect options.
+
 2006-10-20  Danilo Šegan  <danilo@gnome.org>
 
 	* test.py: Added PYTHONPATH to commands.
diff --git a/xml2po/tests/ubuntu-mode.pot b/xml2po/tests/ubuntu-mode.pot
index 4cb6ea7..cda49cd 100644
--- a/xml2po/tests/ubuntu-mode.pot
+++ b/xml2po/tests/ubuntu-mode.pot
@@ -22,19 +22,19 @@ msgid "This site is where you can find the official documentation developed and
 msgstr ""
 
 #: ubuntu-mode.xml:16(para) 
-msgid "<emphasis role=\"bold\">Ubuntu Desktop Guide</emphasis> - <ulink url=\"ubuntu/desktopguide/C/index.html\">HTML</ulink>, <ulink url=\"pdf/ubuntu/C/desktopguide.pdf\">PDF</ulink>"
+msgid "<emphasis role=\"bold\">Ubuntu Desktop Guide</emphasis> - <ulink url=\"ubuntu/desktopguide/&language;/index.html\">HTML</ulink>, <ulink url=\"pdf/ubuntu/&language;/desktopguide.pdf\">PDF</ulink>"
 msgstr ""
 
 #: ubuntu-mode.xml:19(para) 
-msgid "<emphasis role=\"bold\">Kubuntu Desktop Guide</emphasis> - <ulink url=\"kubuntu/desktopguide/C/index.html\">HTML</ulink>, <ulink url=\"pdf/kubuntu/C/desktopguide.pdf\">PDF</ulink>"
+msgid "<emphasis role=\"bold\">Kubuntu Desktop Guide</emphasis> - <ulink url=\"kubuntu/desktopguide/&language;/index.html\">HTML</ulink>, <ulink url=\"pdf/kubuntu/&language;/desktopguide.pdf\">PDF</ulink>"
 msgstr ""
 
 #: ubuntu-mode.xml:22(para) 
-msgid "<emphasis role=\"bold\">Server Guide</emphasis> - <ulink url=\"ubuntu/serverguide/C/index.html\">HTML</ulink>, <ulink url=\"pdf/ubuntu/C/serverguide.pdf\">PDF</ulink>"
+msgid "<emphasis role=\"bold\">Server Guide</emphasis> - <ulink url=\"ubuntu/serverguide/&language;/index.html\">HTML</ulink>, <ulink url=\"pdf/ubuntu/&language;/serverguide.pdf\">PDF</ulink>"
 msgstr ""
 
 #: ubuntu-mode.xml:25(para) 
-msgid "<emphasis role=\"bold\">Packaging Guide</emphasis> - <ulink url=\"ubuntu/packagingguide/C/index.html\">HTML</ulink>, <ulink url=\"pdf/ubuntu/C/packagingguide.pdf\">PDF</ulink>"
+msgid "<emphasis role=\"bold\">Packaging Guide</emphasis> - <ulink url=\"ubuntu/packagingguide/&language;/index.html\">HTML</ulink>, <ulink url=\"pdf/ubuntu/&language;/packagingguide.pdf\">PDF</ulink>"
 msgstr ""
 
 #: ubuntu-mode.xml:28(para) 
@@ -42,11 +42,11 @@ msgid "Find out more about Ubuntu and Kubuntu from the following documents:"
 msgstr ""
 
 #: ubuntu-mode.xml:31(para) 
-msgid "<emphasis role=\"bold\">Ubuntu</emphasis> - <ulink url=\"ubuntu/about-ubuntu/C/index.html\">About Ubuntu</ulink>, <ulink url=\"ubuntu/release-notes/C/index.html\">Ubuntu Release Notes</ulink>"
+msgid "<emphasis role=\"bold\">Ubuntu</emphasis> - <ulink url=\"ubuntu/about-ubuntu/&language;/index.html\">About Ubuntu</ulink>, <ulink url=\"ubuntu/release-notes/&language;/index.html\">Ubuntu Release Notes</ulink>"
 msgstr ""
 
 #: ubuntu-mode.xml:34(para) 
-msgid "<emphasis role=\"bold\">Kubuntu</emphasis> - <ulink url=\"kubuntu/about-kubuntu/C/index.html\">About Kubuntu</ulink>, <ulink url=\"kubuntu/release-notes/C/index.html\">Kubuntu Release Notes</ulink>"
+msgid "<emphasis role=\"bold\">Kubuntu</emphasis> - <ulink url=\"kubuntu/about-kubuntu/&language;/index.html\">About Kubuntu</ulink>, <ulink url=\"kubuntu/release-notes/&language;/index.html\">Kubuntu Release Notes</ulink>"
 msgstr ""
 
 #: ubuntu-mode.xml:37(para) 
diff --git a/xml2po/tests/ubuntu-mode.xml.out b/xml2po/tests/ubuntu-mode.xml.out
index 30d63b5..3578487 100644
--- a/xml2po/tests/ubuntu-mode.xml.out
+++ b/xml2po/tests/ubuntu-mode.xml.out
@@ -2,7 +2,7 @@
 <!DOCTYPE article PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN" "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" [
 <!ENTITY % globalent SYSTEM "../../libs/global.ent">
 <!ENTITY % cdo-C SYSTEM "../../libs/cdo-C.ent">
-<!ENTITY language "C">
+<!ENTITY language "sr">
 ]>
 <article lang="sr">
 	<title>Убунту документација</title>
diff --git a/xml2po/xml2po.py b/xml2po/xml2po.py
index 58dc354..8ce7715 100755
--- a/xml2po/xml2po.py
+++ b/xml2po/xml2po.py
@@ -1,5 +1,6 @@
 #!/usr/bin/python -u
-# Copyright (c) 2004 Danilo Segan <danilo@kvota.net>.
+# -*- encoding: utf-8 -*-
+# Copyright (c) 2004, 2005, 2006 Danilo Šegan <danilo@gnome.org>.
 #
 # This file is part of xml2po.
 #
@@ -133,6 +134,8 @@ msgstr ""
             if self.do_translations:
                 if len(self.translations)>0:
                     translation = self.translations.pop(0)
+            if translation == k:
+                translation = ""
             out.write("msgstr \"%s\"\n\n" % (translation))