Dunedan/0ad
1
0
Fork 0
forked from 0ad/0ad
Code Pull Requests Wiki Activity

Treat code between [] and {} as one blob for translations.

Browse Source 
Agreed By: wraitii
Comments By: elexis
Differential Revision: D3032
Obsoletes: D2451

This was SVN commit r24400.
This commit is contained in:
bb 2020-12-16 21:12:54 +00:00
parent d257122bb4
commit 3726db16b1
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
source/tools/i18n/extractors/extractors.py
View File

@ -1,4 +1,6 @@
# Copyright (C) 2016 Wildfire Games.
#!/usr/bin/env python3
#
# Copyright (C) 2020 Wildfire Games.
# All rights reserved.
#
# Redistribution and use in source and binary forms, with or without modification, are permitted provided that the
@ -120,7 +122,9 @@ class javascript(Extractor):
keywords = self.options.get('keywords', {}).keys()
for token in tokenize(fileObject.read()):
if token.type == 'operator' and token.value == '(':
if token.type == 'operator' and \
(token.value == '(' or (call_stack != -1 and \
(token.value == '[' or token.value == '{'))):
if funcname:
message_lineno = token.lineno
call_stack += 1
@ -198,8 +202,8 @@ class javascript(Extractor):
elif token.value == '+':
concatenate_next = True
elif call_stack > 0 and token.type == 'operator' \
and token.value == ')':
elif call_stack > 0 and token.type == 'operator' and \
(token.value == ')' or token.value == ']' or token.value == '}'):
call_stack -= 1
elif funcname and call_stack == -1: