From cffb49ab34962da169fae889662fb25f8a8e782a Mon Sep 17 00:00:00 2001 From: "Ben V. Brown" Date: Mon, 17 Jun 2019 18:46:37 +1000 Subject: [PATCH] Add wrapper to other strings Adds the conversion wrapper to all of the other strings --- Translation Editor/make_translation.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Translation Editor/make_translation.py b/Translation Editor/make_translation.py index 67055347..f7d9ae3a 100644 --- a/Translation Editor/make_translation.py +++ b/Translation Editor/make_translation.py @@ -192,7 +192,7 @@ def writeLanguage(languageCode, defs, f): for mod in defs['characters']: eid = mod['id'] - f.write(to_unicode("const char " + eid + " = '" + obj[eid] + "';\n")) + f.write(to_unicode("const char* " + eid + " = '" + convStr(symbolConversionTable,obj[eid]) + "';\n")) f.write(to_unicode("\n")) @@ -216,10 +216,10 @@ def writeLanguage(languageCode, defs, f): f.write(to_unicode(" /* " + eid.ljust(maxLen)[:maxLen] + " */ ")) if lang['menuDouble']: f.write( - to_unicode("{ \"" + escapeC(obj[eid]['text2'][0]) + "\", \"" + - escapeC(obj[eid]['text2'][1]) + "\" },\n")) + to_unicode("{ \"" + convStr(symbolConversionTable,(obj[eid]['text2'][0])) + "\", \"" + + convStr(symbolConversionTable,(obj[eid]['text2'][1])) + "\" },\n")) else: - f.write(to_unicode("{ \"" + escapeC(obj[eid]['text']) + "\" },\n")) + f.write(to_unicode("{ \"" + convStr(symbolConversionTable,(obj[eid]['text'])) + "\" },\n")) if 'feature' in mod: f.write(to_unicode("#endif\n")) @@ -236,7 +236,7 @@ def writeLanguage(languageCode, defs, f): eid = mod['id'] f.write(to_unicode(" /* " + eid.ljust(maxLen)[:maxLen] + " */ ")) f.write( - to_unicode("\"" + escapeC(obj[eid]['text2'][0] + "\\n" + + to_unicode("\"" + convStr(symbolConversionTable,(obj[eid]['text2'][0]) + "\\n" + obj[eid]['text2'][1]) + "\",\n")) f.write(to_unicode("};\n\n")) @@ -251,7 +251,7 @@ def writeLanguage(languageCode, defs, f): for mod in defs['menuGroups']: eid = mod['id'] f.write(to_unicode(" /* " + eid.ljust(maxLen)[:maxLen] + " */ ")) - f.write(to_unicode("\"" + escapeC(obj[eid]['desc']) + "\",\n")) + f.write(to_unicode("\"" + convStr(symbolConversionTable,(obj[eid]['desc'])) + "\",\n")) f.write(to_unicode("};\n\n"))