Ticket #122: avahi-xx-g11n-i18n-ui-head.3.diff

avahi/avahi-python/avahi-discover/Makefile.am

@@ -22 +22 @@
 EXTRA_DIST = \
     __init__.py \
     SimpleGladeApp.py \
-    avahi-discover.in \
+    avahi-discover.py \
     avahi-discover.desktop.in.in
 
 if HAVE_PYTHON
@@ -56 +56 @@
 avahi-discover.desktop.in: avahi-discover.desktop.in.in
     sed -e 's,@bindir\@,$(bindir),g' $< > $@
 
-avahi-discover: avahi-discover.in
+avahi-discover: avahi-discover.py
     sed -e 's,@PYTHON\@,$(PYTHON),g' \
         -e 's,@GETTEXT_PACKAGE\@,"$(GETTEXT_PACKAGE)",g' \
-        -e 's,@LOCALEDIR\@,"$(datadir)/locale",g' \
+        -e 's,@LOCALEDIR\@,"$(avahilocaledir)",g' \
         -e 's,@interfacesdir\@,$(interfacesdir),g' $< > $@
     chmod +x $@
 

avahi/avahi-python/avahi-discover/avahi-discover.

@@ -24 +24 @@
 try:
     import avahi, gettext, gtk, gobject, dbus, avahi.ServiceTypeDatabase
     from avahi_discover.SimpleGladeApp import SimpleGladeApp
+    gettext.bindtextdomain(@GETTEXT_PACKAGE@, @LOCALEDIR@)
+    gettext.textdomain(@GETTEXT_PACKAGE@)
     gtk.glade.bindtextdomain(@GETTEXT_PACKAGE@, @LOCALEDIR@)
     gtk.glade.textdomain(@GETTEXT_PACKAGE@)
     _ = gettext.gettext
@@ -68 +70 @@
         if iter is not None:
             (name,interface,protocol,stype,domain) = self.treemodel.get(iter,1,2,3,4,5)
         if stype == None:
-            self.info_label.set_markup("<i>No service currently selected.</i>")
+            self.info_label.set_markup(_("<i>No service currently selected.</i>"))
             return
         #Asynchronous resolving
         self.server.ResolveService( int(interface), int(protocol), name, stype, domain, avahi.PROTO_UNSPEC, dbus.UInt32(0), reply_handler=self.service_resolved, error_handler=self.print_error)
@@ -216 +218 @@
             txts = ""
             txtd = self.pair_to_dict(txt)
             for k,v in txtd.items():
-                txts+="<b>TXT <i>%s</i></b> = %s\n" % (k,v)
+                txts+="<b>" + _("TXT") + " <i>%s</i></b> = %s\n" % (k,v)
         else:
-            txts = "<b>TXT Data:</b> <i>empty</i>"
+            txts = "<b>" + _("TXT Data:") + "</b> <i>" + _("empty") + </i>"
 
-        infos = "<b>Service Type:</b> %s\n<b>Service Name:</b> %s\n<b>Domain Name:</b> %s\n<b>Interface:</b> %s %s\n<b>Address:</b> %s/%s:%i\n%s" % (stype, name, domain, self.siocgifname(interface), self.protoname(protocol), host, address, port, txts.strip())
+        infos = "<b>" + _("Service Type:") + "</b> %s\n"
+        infos += "<b>" + _("Service Name:") + "</b> %s\n"
+        infos += "<b>" + _("Domain Name:") + "</b> %s\n"
+        infos += "<b>" + _("Interface:") + "</b> %s %s\n"
+        infos += "<b>" + _("Address:") + "</b> %s/%s:%i\n%s"
+        infos = infos % (stype, name, domain, self.siocgifname(interface), self.protoname(protocol), host, address, port, txts.strip())
         self.info_label.set_markup(infos)
 
     def insert_row(self, model,parent,

avahi/po/POTFILES.in

@@ -2 +2 @@
 avahi-common/error.c
 avahi-discover-standalone/avahi-discover.glade
 avahi-python/avahi-discover/avahi-discover.desktop.in.in
+avahi-python/avahi-discover/avahi-discover.py
 avahi-ui/avahi-ui.c
 avahi-ui/bssh.c
 avahi-ui/bssh.desktop.in.in

avahi/po/POTFILES.skip

@@ -1 @@
-avahi-discover-standalone/avahi-discover.glade
 avahi-ui/bssh.desktop.in
 avahi-ui/bvnc.desktop.in
 tests/c-plus-plus-test-gen.py