ED/EDMarketConnector
1
0
Fork 0
mirror of https://github.com/EDCD/EDMarketConnector.git synced 2025-04-14 08:17:13 +03:00
Code Issues Projects Releases Wiki Activity

l10n script: Attempt to always use correct LANG comment

Browse Source 
There was an issue where consecutive lines, each with a LANG comment,
caused the next line to use the 'above' line's comment.
This commit is contained in:
Athanasius 2021-06-13 14:58:42 +01:00
parent cba3835698
commit e1e09aebad
1 changed files with 29 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
scripts/find_localised_strings.py
View File

@ -52,7 +52,7 @@ def find_calls_in_stmt(statement: ast.AST) -> list[ast.Call]:
COMMENT_RE = re.compile(r'^.*?(#.*)$')
def extract_comments(call: ast.Call, lines: list[str], file: pathlib.Path) -> Optional[str]:
def extract_comments(call: ast.Call, lines: list[str], file: pathlib.Path) -> Optional[str]: # noqa: CCR001
"""
Extract comments from source code based on the given call.
@ -69,33 +69,44 @@ def extract_comments(call: ast.Call, lines: list[str], file: pathlib.Path) -> Op
current = call.lineno - 1
above_line = lines[above].strip() if len(lines) >= above else None
above_comment: Optional[str] = None
current_line = lines[current].strip()
current_comment: Optional[str] = None
line: Optional[str] = None
bad_comment: Optional[str] = None
for line in (above_line, current_line):
if line is None or '#' not in line:
continue
if above_line is not None:
match = COMMENT_RE.match(above_line)
if match:
above_comment = match.group(1).strip()
if not above_comment.startswith('# LANG:') and not out:
bad_comment = f'Unknown comment for {file}:{call.lineno} {above_line}'
above_comment = None
match = COMMENT_RE.match(line)
if not match:
print(line)
continue
else:
above_comment = above_comment.replace('# LANG:', '').strip()
comment = match.group(1).strip()
if not comment.startswith('# LANG:'):
bad_comment = f'Unknown comment for {file}:{call.lineno} {line}'
continue
if current_line is not None:
match = COMMENT_RE.match(current_line)
if match:
current_comment = match.group(1).strip()
if not current_comment.startswith('# LANG:') and not out:
bad_comment = f'Unknown comment for {file}:{call.lineno} {current_line}'
current_comment = None
out = comment.replace('# LANG:', '').strip()
bad_comment = None
break
else:
current_comment = current_comment.replace('# LANG:', '').strip()
if bad_comment is not None:
if current_comment is not None:
out = current_comment
elif above_comment is not None:
out = above_comment
elif bad_comment is not None:
print(bad_comment, file=sys.stderr)
if out is None:
print(f'No comment for {file}:{call.lineno} {line}', file=sys.stderr)
print(f'No comment for {file}:{call.lineno} {current_line}', file=sys.stderr)
return out