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

Merge pull request #12895 from volzhs/better-ttr-format

Browse Source 
Better TTR format
This commit is contained in:
Rémi Verschelde 2017-11-13 12:46:39 +01:00 committed by GitHub
commit faf097d350
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
editor/filesystem_dock.cpp
View File

@ -333,7 +333,7 @@ void FileSystemDock::navigate_to_path(const String &p_path) {
} else if (dirAccess->dir_exists(p_path)) { } else if (dirAccess->dir_exists(p_path)) {
path = p_path; path = p_path;
} else { } else {
ERR_EXPLAIN(TTR("Cannot navigate to '" + p_path + "' as it has not been found in the file system!")); ERR_EXPLAIN(vformat(TTR("Cannot navigate to '%s' as it has not been found in the file system!"), p_path));
ERR_FAIL(); ERR_FAIL();
} }

2
editor/project_export.cpp
View File

@ -308,7 +308,7 @@ void ProjectExportDialog::_patch_button_pressed(Object *p_item, int p_column, in
if (p_id == 0) { if (p_id == 0) {
Vector<String> patches = current->get_patches(); Vector<String> patches = current->get_patches();
ERR_FAIL_INDEX(patch_index, patches.size()); ERR_FAIL_INDEX(patch_index, patches.size());
patch_erase->set_text(vformat(TTR("Delete patch '" + patches[patch_index].get_file() + "' from list?"))); patch_erase->set_text(vformat(TTR("Delete patch '%s' from list?"), patches[patch_index].get_file()));
patch_erase->popup_centered_minsize(); patch_erase->popup_centered_minsize();
} else { } else {
patch_dialog->popup_centered_ratio(); patch_dialog->popup_centered_ratio();

4
editor/project_settings_editor.cpp
View File

@ -785,12 +785,12 @@ void ProjectSettingsEditor::_item_del() {
String property = globals_editor->get_current_section().plus_file(path); String property = globals_editor->get_current_section().plus_file(path);
if (!ProjectSettings::get_singleton()->has_setting(property)) { if (!ProjectSettings::get_singleton()->has_setting(property)) {
EditorNode::get_singleton()->show_warning(TTR("No property '" + property + "' exists.")); EditorNode::get_singleton()->show_warning(vformat(TTR("No property '%s' exists."), property));
return; return;
} }
if (ProjectSettings::get_singleton()->get_order(property) < ProjectSettings::NO_BUILTIN_ORDER_BASE) { if (ProjectSettings::get_singleton()->get_order(property) < ProjectSettings::NO_BUILTIN_ORDER_BASE) {
EditorNode::get_singleton()->show_warning(TTR("Setting '" + property + "' is internal, and it can't be deleted.")); EditorNode::get_singleton()->show_warning(vformat(TTR("Setting '%s' is internal, and it can't be deleted."), property));
return; return;
} }