godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-16 14:00:40 +00:00
Code Releases Wiki Activity

Improve editor property capitalization

Browse Source 
* Captialize stop words when they are the last word.
* Add stop words logic in `extract.py`.

(cherry picked from commit c0e9d928e6)
This commit is contained in:
Haoyu Qiu
2022-11-25 18:54:37 +08:00
parent 2363d0f9ba
commit fdc21747be
2 changed files with 15 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
editor/editor_property_name_processor.cpp
View File

@@ -64,8 +64,8 @@ String EditorPropertyNameProcessor::_capitalize_name(const String &p_name) const
Vector<String> parts = p_name.split("_", false); Vector<String> parts = p_name.split("_", false);
for (int i = 0; i < parts.size(); i++) { for (int i = 0; i < parts.size(); i++) {
// Articles/conjunctions/prepositions which should only be capitalized if first word. // Articles/conjunctions/prepositions which should only be capitalized when not at beginning and end.
if (i != 0 && stop_words.find(parts[i]) != -1) { if (i > 0 && i + 1 < parts.size() && stop_words.find(parts[i]) != -1) {
continue; continue;
} }
const Map<String, String>::Element *remap = capitalize_string_remaps.find(parts[i]); const Map<String, String>::Element *remap = capitalize_string_remaps.find(parts[i]);
@@ -261,6 +261,8 @@ EditorPropertyNameProcessor::EditorPropertyNameProcessor() {
capitalize_string_remaps["yz"] = "YZ"; capitalize_string_remaps["yz"] = "YZ";
// Articles, conjunctions, prepositions. // Articles, conjunctions, prepositions.
// The following initialization is parsed in `editor/translations/extract.py` with a regex.
// The word definition format should be kept synced with the regex.
stop_words.push_back("a"); stop_words.push_back("a");
stop_words.push_back("an"); stop_words.push_back("an");
stop_words.push_back("and"); stop_words.push_back("and");

13
editor/translations/extract.py
View File

@@ -62,11 +62,17 @@ matches.sort()
remaps = {} remaps = {}
remap_re = re.compile(r'^\t*capitalize_string_remaps\["(?P<from>.+)"\] = (String::utf8\()?"(?P<to>.+)"') remap_re = re.compile(r'^\t*capitalize_string_remaps\["(?P<from>.+)"\] = (String::utf8\()?"(?P<to>.+)"')
stop_words = set()
stop_words_re = re.compile(r'^\t*stop_words\.push_back\("(?P<word>.+)"\)')
with open("editor/editor_property_name_processor.cpp") as f: with open("editor/editor_property_name_processor.cpp") as f:
for line in f: for line in f:
m = remap_re.search(line) m = remap_re.search(line)
if m: if m:
remaps[m.group("from")] = m.group("to") remaps[m.group("from")] = m.group("to")
else:
m = stop_words_re.search(line)
if m:
stop_words.add(m.group("word"))
main_po = """ main_po = """
@@ -126,9 +132,12 @@ capitalize_re = re.compile(r"(?<=\D)(?=\d)|(?<=\d)(?=\D([a-z]|\d))")
def _process_editor_string(name): def _process_editor_string(name):
# See EditorPropertyNameProcessor::process_string(). # See EditorPropertyNameProcessor::process_string().
capitalized_parts = [] capitalized_parts = []
for segment in name.split("_"): parts = list(filter(bool, name.split("_"))) # Non-empty only.
if not segment: for i, segment in enumerate(parts):
if i > 0 and i + 1 < len(parts) and segment in stop_words:
capitalized_parts.append(segment)
continue continue
remapped = remaps.get(segment) remapped = remaps.get(segment)
if remapped: if remapped:
capitalized_parts.append(remapped) capitalized_parts.append(remapped)