godotengine/godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix vformat(), minor typos and word puzzles

Browse Source
This commit is contained in:
Yuri Chornoivan 2018-08-28 21:15:04 +03:00
parent d42807371c
commit 06e73522dc
6 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
editor/connections_dialog.cpp
View File

@ -650,8 +650,8 @@ void ConnectionsDock::_handle_signal_menu_option(int option) {
_open_connection_dialog(*item); _open_connection_dialog(*item);
} break; } break;
case DISCONNECT_ALL: { case DISCONNECT_ALL: {
StringName signalName = item->get_metadata(0).operator Dictionary()["name"]; StringName signal_name = item->get_metadata(0).operator Dictionary()["name"];
disconnect_all_dialog->set_text(TTR("Are you sure you want to remove all connections from the \"") + signalName + "\" signal?"); disconnect_all_dialog->set_text(vformat(TTR("Are you sure you want to remove all connections from the \"%s\" signal?"), signal_name));
disconnect_all_dialog->popup_centered(); disconnect_all_dialog->popup_centered();
} break; } break;
} }

2
editor/plugins/script_editor_plugin.cpp
View File

@ -862,7 +862,7 @@ void ScriptEditor::_file_dialog_action(String p_file) {
if (extensions.find(p_file.get_extension())) { if (extensions.find(p_file.get_extension())) {
Ref<Script> scr = ResourceLoader::load(p_file); Ref<Script> scr = ResourceLoader::load(p_file);
if (!scr.is_valid()) { if (!scr.is_valid()) {
editor->show_warning(TTR("Error could not load file."), TTR("Error!")); editor->show_warning(TTR("Error: could not load file."), TTR("Error!"));
file_dialog_option = -1; file_dialog_option = -1;
return; return;
} }

2
editor/plugins/tile_set_editor_plugin.cpp
View File

@ -581,7 +581,7 @@ void TileSetEditor::_on_textures_added(const PoolStringArray &p_paths) {
texture_list->select(texture_list->get_item_count() - 1); texture_list->select(texture_list->get_item_count() - 1);
_on_texture_list_selected(texture_list->get_item_count() - 1); _on_texture_list_selected(texture_list->get_item_count() - 1);
if (invalid_count > 0) { if (invalid_count > 0) {
err_dialog->set_text(String::num(invalid_count, 0) + TTR(" file(s) was not added because was already on the list.")); err_dialog->set_text(vformat(TTR("%s file(s) were not added because was already on the list."), String::num(invalid_count, 0)));
err_dialog->popup_centered(Size2(300, 60)); err_dialog->popup_centered(Size2(300, 60));
} }
} }

8
editor/rename_dialog.cpp
View File

@ -220,21 +220,21 @@ RenameDialog::RenameDialog(SceneTreeEditor *p_scene_tree_editor, UndoRedo *p_und
Label *lbl_count_step = memnew(Label); Label *lbl_count_step = memnew(Label);
lbl_count_step->set_text(TTR("Step")); lbl_count_step->set_text(TTR("Step"));
lbl_count_step->set_tooltip(TTR("Ammount by which counter is incremented for each node")); lbl_count_step->set_tooltip(TTR("Amount by which counter is incremented for each node"));
hbc_count_options->add_child(lbl_count_step); hbc_count_options->add_child(lbl_count_step);
spn_count_step = memnew(SpinBox); spn_count_step = memnew(SpinBox);
spn_count_step->set_tooltip(TTR("Ammount by which counter is incremented for each node")); spn_count_step->set_tooltip(TTR("Amount by which counter is incremented for each node"));
spn_count_step->set_step(1); spn_count_step->set_step(1);
hbc_count_options->add_child(spn_count_step); hbc_count_options->add_child(spn_count_step);
Label *lbl_count_padding = memnew(Label); Label *lbl_count_padding = memnew(Label);
lbl_count_padding->set_text(TTR("Padding")); lbl_count_padding->set_text(TTR("Padding"));
lbl_count_padding->set_tooltip(TTR("Minium number of digits for the counter.\nMissing digits are padded with leading zeros.")); lbl_count_padding->set_tooltip(TTR("Minimum number of digits for the counter.\nMissing digits are padded with leading zeros."));
hbc_count_options->add_child(lbl_count_padding); hbc_count_options->add_child(lbl_count_padding);
spn_count_padding = memnew(SpinBox); spn_count_padding = memnew(SpinBox);
spn_count_padding->set_tooltip(TTR("Minium number of digits for the counter.\nMissing digits are padded with leading zeros.")); spn_count_padding->set_tooltip(TTR("Minimum number of digits for the counter.\nMissing digits are padded with leading zeros."));
spn_count_padding->set_step(1); spn_count_padding->set_step(1);
hbc_count_options->add_child(spn_count_padding); hbc_count_options->add_child(spn_count_padding);

4
modules/visual_script/visual_script_property_selector.cpp
View File

@ -191,10 +191,10 @@ void VisualScriptPropertySelector::_update_search() {
if (type_filter.size() && type_filter.find(E->get().type) == -1) if (type_filter.size() && type_filter.find(E->get().type) == -1)
continue; continue;
String get_text_raw = String(TTR("Get")) + String(" ") + E->get().name; String get_text_raw = String(vformat(TTR("Get %s"), E->get().name));
String get_text = get_text_raw.capitalize(); String get_text = get_text_raw.capitalize();
String set_text_raw = String(TTR("Set ")) + String(" ") + E->get().name; String set_text_raw = String(vformat(TTR("Set %s"), E->get().name));
String set_text = set_text_raw.capitalize(); String set_text = set_text_raw.capitalize();
String input = search_box->get_text().capitalize(); String input = search_box->get_text().capitalize();
if (input == String() || if (input == String() ||

2
scene/3d/soft_body.cpp
View File

@ -401,7 +401,7 @@ String SoftBody::get_configuration_warning() const {
if (!warning.empty()) if (!warning.empty())
warning += "\n\n"; warning += "\n\n";
warning += TTR("Size changes to SoftBody will be overriden by the physics engine when running.\nChange the size in children collision shapes instead."); warning += TTR("Size changes to SoftBody will be overridden by the physics engine when running.\nChange the size in children collision shapes instead.");
} }
return warning; return warning;