From 2140eced7950fbd41c4dca906550ea3cfb9b50a2 Mon Sep 17 00:00:00 2001 From: Vinyl Darkscratch Date: Fri, 9 Sep 2016 01:26:41 -0700 Subject: [PATCH] Fixing a consistency error when updating T.M() translations --- gluon/languages.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gluon/languages.py b/gluon/languages.py index 98fa4790..afc5b332 100644 --- a/gluon/languages.py +++ b/gluon/languages.py @@ -962,7 +962,7 @@ def findT(path, language=DEFAULT_LANGUAGE): + listdir(vp, '^.+\.html$', 0) + listdir(mop, '^.+\.py$', 0): data = to_native(read_locked(filename)) items = regex_translate.findall(data) - items += regex_translate_m.findall(data) + items += ["@markmin\x01%s" %x for x in regex_translate_m.findall(data)] for item in items: try: message = safe_eval(item) @@ -976,7 +976,7 @@ def findT(path, language=DEFAULT_LANGUAGE): if len(tokens) == 2: message = tokens[0].strip() + '##' + tokens[1].strip() if message and not message in sentences: - sentences[message] = message + sentences[message] = message.replace("@markmin\x01", "") if not '!langcode!' in sentences: sentences['!langcode!'] = ( DEFAULT_LANGUAGE if language in ('default', DEFAULT_LANGUAGE) else language)