From 8619d209d0de052cfeae36d6089a95060bea5876 Mon Sep 17 00:00:00 2001 From: Alexander Borsuk Date: Sun, 2 Oct 2022 16:14:48 +0200 Subject: [PATCH] [strings] Added exceptions to clean_strings_txt.py and fixed iOS Regex Signed-off-by: Alexander Borsuk --- iphone/Maps/UI/Help/AboutController.swift | 2 +- tools/python/clean_strings_txt.py | 12 +++++++----- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/iphone/Maps/UI/Help/AboutController.swift b/iphone/Maps/UI/Help/AboutController.swift index 70e50d1531..f0e8f01c60 100644 --- a/iphone/Maps/UI/Help/AboutController.swift +++ b/iphone/Maps/UI/Help/AboutController.swift @@ -114,7 +114,7 @@ final class AboutController: MWMViewController, UITableViewDataSource, UITableVi // MARK: - UITableView data source - // Update didSelect... delegate after modifying this list. + // Update didSelect... delegate and tools/python/clean_strings_txt.py after modifying this list. private let labels = [ ["news", "faq", "report_a_bug", "how_to_support_us", "rate_the_app"], ["telegram", "github", "website", "email", "facebook", "twitter", "instagram", "matrix", "openstreetmap"], diff --git a/tools/python/clean_strings_txt.py b/tools/python/clean_strings_txt.py index efec8d89e4..7d183f22c5 100755 --- a/tools/python/clean_strings_txt.py +++ b/tools/python/clean_strings_txt.py @@ -23,7 +23,7 @@ CORE_RE = re.compile(r'GetLocalizedString\("(.*?)"\)') # max 2 matches in L(). Tried to make ()+ group, but no luck .. IOS_RE = re.compile(r'L\(.*?"(\w+)".*?(?:"(\w+)")?\)') -IOS_NS_RE = re.compile(r'NSLocalizedString\(\s*?"(\w+)"') +IOS_NS_RE = re.compile(r'NSLocalizedString\(\s*?@?"(\w+)"') IOS_XML_RE = re.compile(r'value=\"(.*?)\"') ANDROID_JAVA_RE = re.compile(r'R\.string\.([\w_]*)') @@ -34,12 +34,14 @@ IOS_CANDIDATES_RE = re.compile(r'(.*?):[^L\(]@"([a-z0-9_]*?)"') HARDCODED_CATEGORIES = None -HARDCODED_COLORS = [ +HARDCODED_STRINGS = [ # titleForBookmarkColor "red", "blue", "purple", "yellow", "pink", "brown", "green", "orange", "deep_purple", "light_blue", "cyan", "teal", "lime", "deep_orange", "gray", "blue_gray", - # Used in About - "matrix" + # Used in About in iphone/Maps/UI/Help/AboutController.swift + "news", "faq", "report_a_bug", "how_to_support_us", "rate_the_app", + "telegram", "github", "website", "email", "facebook", "twitter", "instagram", "matrix", "openstreetmap", + "privacy_policy", "terms_of_use", "copyright", ] @@ -110,7 +112,7 @@ def grep_ios_candidates(): def get_hardcoded(): ret = parenthesize(HARDCODED_CATEGORIES) - ret.update(parenthesize(HARDCODED_COLORS)) + ret.update(parenthesize(HARDCODED_STRINGS)) logging.info("Hardcoded colors and categories: {0}".format(len(ret))) return ret