dinislage/web2py
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixing a consistency error when updating T.M() translations

Browse Source
This commit is contained in:
Vinyl Darkscratch
2016-09-09 01:26:41 -07:00
parent f9dce481f7
commit 2140eced79
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
gluon/languages.py
+2 -2
View File
@@ -962,7 +962,7 @@ def findT(path, language=DEFAULT_LANGUAGE):
+ listdir(vp, '^.+\.html$', 0) + listdir(mop, '^.+\.py$', 0): + listdir(vp, '^.+\.html$', 0) + listdir(mop, '^.+\.py$', 0):
data = to_native(read_locked(filename)) data = to_native(read_locked(filename))
items = regex_translate.findall(data) 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: for item in items:
try: try:
message = safe_eval(item) message = safe_eval(item)
@@ -976,7 +976,7 @@ def findT(path, language=DEFAULT_LANGUAGE):
if len(tokens) == 2: if len(tokens) == 2:
message = tokens[0].strip() + '##' + tokens[1].strip() message = tokens[0].strip() + '##' + tokens[1].strip()
if message and not message in sentences: if message and not message in sentences:
sentences[message] = message sentences[message] = message.replace("@markmin\x01", "")
if not '!langcode!' in sentences: if not '!langcode!' in sentences:
sentences['!langcode!'] = ( sentences['!langcode!'] = (
DEFAULT_LANGUAGE if language in ('default', DEFAULT_LANGUAGE) else language) DEFAULT_LANGUAGE if language in ('default', DEFAULT_LANGUAGE) else language)