浏览代码

Better TTR format

volzhs 7 年之前
父节点
当前提交
2e7345c00f
共有 3 个文件被更改,包括 4 次插入4 次删除
  1. 1 1
      editor/filesystem_dock.cpp
  2. 1 1
      editor/project_export.cpp
  3. 2 2
      editor/project_settings_editor.cpp

+ 1 - 1
editor/filesystem_dock.cpp

@@ -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();
 	}
 	}
 
 

+ 1 - 1
editor/project_export.cpp

@@ -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();

+ 2 - 2
editor/project_settings_editor.cpp

@@ -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;
 	}
 	}