1 files changed, 3 insertions, 1 deletions
diff --git a/Mailman/i18n.py b/Mailman/i18n.py
index d64560803..59d10db25 100644
--- a/Mailman/i18n.py
+++ b/Mailman/i18n.py
@@ -112,7 +112,9 @@ def _(s):
     # Are we using $-strings or %-strings?
     if use_templates:
         return Template(tns).safe_substitute(attrdict(d))
-    return tns % SafeDict(d)
+    if type(tns) == str:
+        tns = unicode(tns, charset)
+    return SafeDict(d, charset=charset).interpolate(tns)