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

This adds support for _<<map="{maps/01_First_Map.map}">>.
wesnoth · Oct 19, 2019 · c30c30a · c30c30a
1 parent 3535cee
commit c30c30a
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 4 deletions.
diff --git a/changelog.md b/changelog.md
@@ -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

diff --git a/data/tools/pywmlx/state/machine.py b/data/tools/pywmlx/state/machine.py
@@ -248,11 +248,13 @@ def store(self):
 
 
 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 @@ def store(self):
                 # 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,

diff --git a/data/tools/pywmlx/state/wml_states.py b/data/tools/pywmlx/state/wml_states.py
@@ -169,7 +169,7 @@ def run(self, xline, lineno, match):
                    '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 @@ def run(self, xline, lineno, match):
             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)