# HG changeset patch
# User cmlenz
# Date 1213717774 0
# Node ID 09b4d8912dffd9384009e2707bea4dbfede4da80
# Parent  ce8f4f90f71e2d4f3d468e0c8c2a57459a587e99
Ported [888] back to 0.5.x branch.

diff --git a/ChangeLog b/ChangeLog
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,10 @@
  * Fix problem with nested match templates not being applied when buffering
    on the outer `py:match` is disabled. Thanks to Erik Bray for reporting the
    problem and providing a test case!
+ * Fix problem in `Translator` filter that would cause the translation of
+   text nodes to fail if the translation function returned an object that was
+   not directly a string, but rather something like an instance of the
+   `LazyProxy` class in Babel (ticket #145).
 
 
 Version 0.5
diff --git a/genshi/filters/i18n.py b/genshi/filters/i18n.py
--- a/genshi/filters/i18n.py
+++ b/genshi/filters/i18n.py
@@ -189,7 +189,7 @@
                 if not msgbuf:
                     text = data.strip()
                     if text:
-                        data = data.replace(text, translate(text))
+                        data = data.replace(text, unicode(translate(text)))
                     yield kind, data, pos
                 else:
                     msgbuf.append(kind, data, pos)