0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

wmlxgettext: support double quotes in raw strings (fixes #4484)

Browse source 
This adds support for _<<map="{maps/01_First_Map.map}">>.
This commit is contained in:
Steve Cotton 2019-10-18 10:39:08 +02:00
parent 3535cee5af
commit c30c30acfc
3 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
changelog.md
View file

@ -92,6 +92,7 @@
* On windows, relative paths that start with `.\` are not deprecated
* Removed incomplete joystick support.
* Removed option to disable unit and item halos.
* Added support to wmlxgettext for double-quote characters in translatable raw strings
## Version 1.15.1
### Editor

9
data/tools/pywmlx/state/machine.py
View file

@ -248,11 +248,13 @@ class PendingLuaString:
class PendingWmlString:
def __init__(self, lineno, wmlstring, ismultiline, istranslatable):
def __init__(self, lineno, wmlstring, ismultiline, istranslatable, israw):
"""The israw argument indicates a << >> delimited string"""
self.lineno = lineno
self.wmlstring = wmlstring.replace('\\', r'\\')
self.ismultiline = ismultiline
self.istranslatable = istranslatable
self.israw = israw
def addline(self, value):
self.wmlstring = self.wmlstring + '\n' + value.replace('\\', r'\\')
@ -275,7 +277,10 @@ class PendingWmlString:
# so, using "if errcode != 1"
# we will add the translatable string ONLY if it is NOT empty
_linenosub += 1
self.wmlstring = re.sub('""', r'\"', self.wmlstring)
if self.israw:
self.wmlstring = re.sub('"', r'\"', self.wmlstring)
else:
self.wmlstring = re.sub('""', r'\"', self.wmlstring)
pywmlx.nodemanip.addNodeSentence(self.wmlstring,
ismultiline=self.ismultiline,
lineno=self.lineno,

4
data/tools/pywmlx/state/wml_states.py
View file

@ -169,7 +169,7 @@ class WmlStr02:
'please report a bug if you encounter this error message')
pywmlx.state.machine._pending_wmlstring = (
pywmlx.state.machine.PendingWmlString(
lineno, loc_string, loc_multiline, loc_translatable
lineno, loc_string, loc_multiline, loc_translatable, israw=True
)
)
return (xline, _nextstate)
@ -249,7 +249,7 @@ class WmlStr01:
xline = xline [ match.end(): ]
pywmlx.state.machine._pending_wmlstring = (
pywmlx.state.machine.PendingWmlString(
lineno, match.group(2), loc_multiline, loc_translatable
lineno, match.group(2), loc_multiline, loc_translatable, israw=False
)
)
return (xline, _nextstate)