also normalize tuples for gettext calls

1 files changed, 10 insertions, 3 deletions

diff --git a/i18nfix.py b/i18nfix.py
index 69fe177..e1d5bb4 100644
--- a/i18nfix.py
+++ b/i18nfix.py
@@ -16,24 +16,31 @@ import re
 import jinja2.ext
 
 
-def normalize(message):
+def normalize_str(message):
     message = message.strip()
     # collapse whitespaces (including newlines) into one space.
     message = re.sub("\s+", " ", message)
     return message
 
 
+def normalize(message):
+    if isinstance(message, str):
+        return normalize_str(message)
+    elif isinstance(message, tuple):
+        return tuple([normalize_str(x) for x in message])
+
+
 def babel_extract(fileobj, keywords, comment_tags, options):
     res = jinja2.ext.babel_extract(fileobj, keywords, comment_tags, options)
     for lineno, funcname, message, comments in res:
-        message = normalize(message)
-        yield lineno, funcname, message, comments
+        yield lineno, funcname, normalize(message), comments
 
 
 def wrap_gettext(f):
     """
     Call gettext with whitespace normalized.
     """
+
     def wrapper(message):
         message = normalize(message)
         return f(message)