godotengine
/
godot
mirror of https://github.com/godotengine/godot
1
0
Fork 0
Code

Avoid text substitution in EditorHelp messages

This commit is contained in:
Haoyu Qiu 2023-09-05 23:15:34 +08:00
parent 332bc469c4
commit e350034251
2 changed files with 25 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
editor/editor_help.cpp
View File

@ -641,7 +641,7 @@ void EditorHelp::_update_method_list(const Vector<DocData::MethodDoc> p_methods)
class_desc->add_newline(); class_desc->add_newline();
} }
void EditorHelp::_update_method_descriptions(const DocData::ClassDoc p_classdoc, const Vector<DocData::MethodDoc> p_methods, const String &p_method_type) { void EditorHelp::_update_method_descriptions(const DocData::ClassDoc p_classdoc, const Vector<DocData::MethodDoc> p_methods, MethodType p_method_type) {
String link_color_text = theme_cache.title_color.to_html(false); String link_color_text = theme_cache.title_color.to_html(false);
class_desc->add_newline(); class_desc->add_newline();
@ -699,11 +699,24 @@ void EditorHelp::_update_method_descriptions(const DocData::ClassDoc p_classdoc,
class_desc->add_image(get_theme_icon(SNAME("Error"), SNAME("EditorIcons"))); class_desc->add_image(get_theme_icon(SNAME("Error"), SNAME("EditorIcons")));
class_desc->add_text(" "); class_desc->add_text(" ");
class_desc->push_color(theme_cache.comment_color); class_desc->push_color(theme_cache.comment_color);
String message;
if (p_classdoc.is_script_doc) { if (p_classdoc.is_script_doc) {
class_desc->append_text(vformat(TTR("There is currently no description for this %s."), p_method_type)); static const char *messages_by_type[METHOD_TYPE_MAX] = {
TTRC("There is currently no description for this method."),
TTRC("There is currently no description for this constructor."),
TTRC("There is currently no description for this operator."),
};
message = TTRGET(messages_by_type[p_method_type]);
} else { } else {
class_desc->append_text(vformat(TTR("There is currently no description for this %s. Please help us by [color=$color][url=$url]contributing one[/url][/color]!"), p_method_type).replace("$url", CONTRIBUTE_URL).replace("$color", link_color_text)); static const char *messages_by_type[METHOD_TYPE_MAX] = {
TTRC("There is currently no description for this method. Please help us by [color=$color][url=$url]contributing one[/url][/color]!"),
TTRC("There is currently no description for this constructor. Please help us by [color=$color][url=$url]contributing one[/url][/color]!"),
TTRC("There is currently no description for this operator. Please help us by [color=$color][url=$url]contributing one[/url][/color]!"),
};
message = TTRGET(messages_by_type[p_method_type]).replace("$url", CONTRIBUTE_URL).replace("$color", link_color_text);
} }
class_desc->append_text(message);
class_desc->pop(); class_desc->pop();
} }
@ -1842,7 +1855,7 @@ void EditorHelp::_update_doc() {
class_desc->add_text(TTR("Constructor Descriptions")); class_desc->add_text(TTR("Constructor Descriptions"));
_pop_title_font(); _pop_title_font();
_update_method_descriptions(cd, cd.constructors, "constructor"); _update_method_descriptions(cd, cd.constructors, METHOD_TYPE_CONSTRUCTOR);
} }
// Method descriptions // Method descriptions
@ -1852,7 +1865,7 @@ void EditorHelp::_update_doc() {
class_desc->add_text(TTR("Method Descriptions")); class_desc->add_text(TTR("Method Descriptions"));
_pop_title_font(); _pop_title_font();
_update_method_descriptions(cd, methods, "method"); _update_method_descriptions(cd, methods, METHOD_TYPE_METHOD);
} }
// Operator descriptions // Operator descriptions
@ -1862,7 +1875,7 @@ void EditorHelp::_update_doc() {
class_desc->add_text(TTR("Operator Descriptions")); class_desc->add_text(TTR("Operator Descriptions"));
_pop_title_font(); _pop_title_font();
_update_method_descriptions(cd, cd.operators, "operator"); _update_method_descriptions(cd, cd.operators, METHOD_TYPE_OPERATOR);
} }
// Free the scroll. // Free the scroll.

15
editor/editor_help.h
View File

@ -86,14 +86,11 @@ public:
class EditorHelp : public VBoxContainer { class EditorHelp : public VBoxContainer {
GDCLASS(EditorHelp, VBoxContainer); GDCLASS(EditorHelp, VBoxContainer);
enum Page { enum MethodType {
PAGE_CLASS_LIST, METHOD_TYPE_METHOD,
PAGE_CLASS_DESC, METHOD_TYPE_CONSTRUCTOR,
PAGE_CLASS_PREV, METHOD_TYPE_OPERATOR,
PAGE_CLASS_NEXT, METHOD_TYPE_MAX
PAGE_SEARCH,
CLASS_SEARCH,
}; };
bool select_locked = false; bool select_locked = false;
@ -181,7 +178,7 @@ class EditorHelp : public VBoxContainer {
Error _goto_desc(const String &p_class); Error _goto_desc(const String &p_class);
//void _update_history_buttons(); //void _update_history_buttons();
void _update_method_list(const Vector<DocData::MethodDoc> p_methods); void _update_method_list(const Vector<DocData::MethodDoc> p_methods);
void _update_method_descriptions(const DocData::ClassDoc p_classdoc, const Vector<DocData::MethodDoc> p_methods, const String &p_method_type); void _update_method_descriptions(const DocData::ClassDoc p_classdoc, const Vector<DocData::MethodDoc> p_methods, MethodType p_method_type);
void _update_doc(); void _update_doc();
void _request_help(const String &p_string); void _request_help(const String &p_string);