From dd8198656bc1724e08f320d8a52cdf9d1029efb0 Mon Sep 17 00:00:00 2001 From: David Benepe Date: Sat, 5 Feb 2022 15:38:55 -0500 Subject: [PATCH] More progress with regional names --- tools/python/fix_regional_names.py | 7 +++++-- tools/python/regional_names.json | 17 ++++++++++++----- 2 files changed, 17 insertions(+), 7 deletions(-) diff --git a/tools/python/fix_regional_names.py b/tools/python/fix_regional_names.py index fa1ed295..3d7f6412 100755 --- a/tools/python/fix_regional_names.py +++ b/tools/python/fix_regional_names.py @@ -18,7 +18,7 @@ TERMINAL_COLOR_RESET = "\033[0m" REGIONAL_NAMES_JSON_PATH = 'tools/python/regional_names.json' # Note: All names MUST be lowercase -diffMap = json.loads(FileUtil.readAllText(REGIONAL_NAMES_JSON_PATH)) +diffMap = json.loads(FileUtil.get_text_from_file(REGIONAL_NAMES_JSON_PATH))['diffMap'] def precheckForErrors(version): versionBuildPath = 'build/' + version @@ -31,9 +31,12 @@ def precheckForErrors(version): return None return symMapPath +def filterSymMapText(symMapText) + def getSymbolsFromMapText(symMapText): symbols = set() + matches = re.finditer(REGEX_MAP_SYMBOL, symMapText, re.MULTILINE) for matchNum, match in enumerate(matches, start=1): @@ -122,7 +125,7 @@ def convertName(convertTo, version): symMapPath = precheckForErrors(version) if symMapPath is None: return - symMapText = FileUtil.get_text_from_file(symMapPath) + symMapText = filterSymMapText(FileUtil.get_text_from_file(symMapPath)) symbols = getSymbolsFromMapText(symMapText) symbolReplaces = filterOutSymbols(symbols, convertTo) validReplaces = validateReplaces(symbolReplaces) diff --git a/tools/python/regional_names.json b/tools/python/regional_names.json index f4320b2d..4dbc9d08 100644 --- a/tools/python/regional_names.json +++ b/tools/python/regional_names.json @@ -1,5 +1,12 @@ -[ - { "us": "color", "uk": "colour" }, - { "us": "gray", "uk": "grey" }, - { "us": "dialog", "uk": "dialogue" } -] +{ + "note": "All names must be lower case!", + "diffMap": [ + { "us": "color", "uk": "colour" }, + { "us": "gray", "uk": "grey" }, + { "us": "dialog", "uk": "dialogue" }, + { "us": "dialogs", "uk": "dialogues" }, + { "us": "initialize", "uk": "initialise" } + ] +} + +