# HG changeset patch
# User cmlenz
# Date 1177801635 0
# Node ID 25ded2b7ed385b02f177e7a268fd7aff21a3422f
# Parent  b2a00e4e7815cbea81f71a2553ba8129f300cb6d
Ported [566] and [567] to 0.4.x.

diff --git a/genshi/filters/i18n.py b/genshi/filters/i18n.py
--- a/genshi/filters/i18n.py
+++ b/genshi/filters/i18n.py
@@ -71,7 +71,8 @@
         QName('script'), QName('http://www.w3.org/1999/xhtml}script'),
         QName('style'), QName('http://www.w3.org/1999/xhtml}style')
     ])
-    INCLUDE_ATTRS = frozenset(['title', 'alt'])
+    INCLUDE_ATTRS = frozenset(['abbr', 'alt', 'label', 'prompt', 'standby',
+                               'summary', 'title'])
 
     def __init__(self, translate=gettext, ignore_tags=IGNORE_TAGS,
                  include_attrs=INCLUDE_ATTRS):
@@ -227,7 +228,8 @@
                             if text:
                                 yield pos[1], None, text
                         else:
-                            for lineno, funcname, text in harvest(value):
+                            for lineno, funcname, text in self.extract(value,
+                                    gettext_functions):
                                 yield lineno, funcname, text
 
             elif kind is TEXT:
@@ -264,5 +266,6 @@
 
             elif kind is SUB:
                 subkind, substream = data
-                for lineno, funcname, text in self.harvest(substream):
+                for lineno, funcname, text in self.extract(substream,
+                                                           gettext_functions):
                     yield lineno, funcname, text