diff options
author | Yevgeny Makarov <jenkm> | 2019-10-01 21:15:16 +0300 |
---|---|---|
committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2019-10-01 21:18:48 +0300 |
commit | 3e8276311ed17d12e8b47b4fe8e2f68c1ce8c603 (patch) | |
tree | 8ded1a157eff21907d21f7c66b1cb903eb86d76e | |
parent | 17f6b4d0f8d9b55b631fbf3fa24e81d1266c3ec8 (diff) |
UI: use correct singular and plural nouns in report messages
Differential Revision: https://developer.blender.org/D5729
-rw-r--r-- | source/blender/blenkernel/intern/packedFile.c | 6 | ||||
-rw-r--r-- | source/blender/editors/mesh/editmesh_tools.c | 12 | ||||
-rw-r--r-- | source/blender/editors/object/object_add.c | 6 | ||||
-rw-r--r-- | source/blender/editors/physics/particle_edit.c | 6 | ||||
-rw-r--r-- | source/blender/editors/space_image/image_ops.c | 7 | ||||
-rw-r--r-- | source/blender/editors/space_outliner/outliner_edit.c | 18 | ||||
-rw-r--r-- | source/blender/editors/space_view3d/view3d_ops.c | 12 |
7 files changed, 56 insertions, 11 deletions
diff --git a/source/blender/blenkernel/intern/packedFile.c b/source/blender/blenkernel/intern/packedFile.c index 1085e515b3a..cc3b10b1207 100644 --- a/source/blender/blenkernel/intern/packedFile.c +++ b/source/blender/blenkernel/intern/packedFile.c @@ -267,7 +267,11 @@ void BKE_packedfile_pack_all(Main *bmain, ReportList *reports, bool verbose) } if (tot > 0) { - BKE_reportf(reports, RPT_INFO, "Packed %d files", tot); + BKE_reportf(reports, + RPT_INFO, + tot == 1 ? "Packed %d file" : + "Packed %d files", + tot); } else if (verbose) { BKE_report(reports, RPT_INFO, "No new files have been packed"); diff --git a/source/blender/editors/mesh/editmesh_tools.c b/source/blender/editors/mesh/editmesh_tools.c index 51c668ed43c..4636d1ee71e 100644 --- a/source/blender/editors/mesh/editmesh_tools.c +++ b/source/blender/editors/mesh/editmesh_tools.c @@ -2044,7 +2044,11 @@ static int edbm_edge_rotate_selected_exec(bContext *C, wmOperator *op) } if (tot_failed_all != 0) { - BKE_reportf(op->reports, RPT_WARNING, "Unable to rotate %d edge(s)", tot_failed_all); + BKE_reportf(op->reports, + RPT_WARNING, + tot_failed_all == 1 ? "Unable to rotate %d edge" : + "Unable to rotate %d edges", + tot_failed_all); } return OPERATOR_FINISHED; @@ -3161,7 +3165,11 @@ static int edbm_remove_doubles_exec(bContext *C, wmOperator *op) } MEM_freeN(objects); - BKE_reportf(op->reports, RPT_INFO, "Removed %d vertices", count_multi); + BKE_reportf(op->reports, + RPT_INFO, + count_multi == 1 ? "Removed %d vertex" : + "Removed %d vertices", + count_multi); return OPERATOR_FINISHED; } diff --git a/source/blender/editors/object/object_add.c b/source/blender/editors/object/object_add.c index 52618ba4dfc..d6816ddbe73 100644 --- a/source/blender/editors/object/object_add.c +++ b/source/blender/editors/object/object_add.c @@ -1581,7 +1581,11 @@ static int object_delete_exec(bContext *C, wmOperator *op) } CTX_DATA_END; - BKE_reportf(op->reports, RPT_INFO, "Deleted %u object(s)", changed_count); + BKE_reportf(op->reports, + RPT_INFO, + changed_count == 1 ? "Deleted %u object" : + "Deleted %u objects", + changed_count); if (changed_count == 0) { return OPERATOR_CANCELLED; diff --git a/source/blender/editors/physics/particle_edit.c b/source/blender/editors/physics/particle_edit.c index 19402316882..2ea0e9dc018 100644 --- a/source/blender/editors/physics/particle_edit.c +++ b/source/blender/editors/physics/particle_edit.c @@ -3076,7 +3076,11 @@ static int remove_doubles_exec(bContext *C, wmOperator *op) return OPERATOR_CANCELLED; } - BKE_reportf(op->reports, RPT_INFO, "Removed %d double particles", totremoved); + BKE_reportf(op->reports, + RPT_INFO, + totremoved == 1 ? "Removed %d double particle" : + "Removed %d double particles", + totremoved); DEG_id_tag_update(&ob->id, ID_RECALC_GEOMETRY); WM_event_add_notifier(C, NC_OBJECT | ND_PARTICLE | NA_EDITED, ob); diff --git a/source/blender/editors/space_image/image_ops.c b/source/blender/editors/space_image/image_ops.c index a8dfad85232..39f7bf001f3 100644 --- a/source/blender/editors/space_image/image_ops.c +++ b/source/blender/editors/space_image/image_ops.c @@ -2298,7 +2298,12 @@ static int image_save_sequence_exec(bContext *C, wmOperator *op) /* get a filename for menu */ BLI_split_dir_part(first_ibuf->name, di, sizeof(di)); - BKE_reportf(op->reports, RPT_INFO, "%d image(s) will be saved in %s", tot, di); + BKE_reportf(op->reports, + RPT_INFO, + tot == 1 ? "%d image will be saved in %s" : + "%d images will be saved in %s", + tot, + di); iter = IMB_moviecacheIter_new(image->cache); while (!IMB_moviecacheIter_done(iter)) { diff --git a/source/blender/editors/space_outliner/outliner_edit.c b/source/blender/editors/space_outliner/outliner_edit.c index 0e2a8afea17..c81d292a859 100644 --- a/source/blender/editors/space_outliner/outliner_edit.c +++ b/source/blender/editors/space_outliner/outliner_edit.c @@ -770,7 +770,11 @@ static int outliner_id_copy_exec(bContext *C, wmOperator *op) BLI_make_file_string("/", str, BKE_tempdir_base(), "copybuffer.blend"); BKE_copybuffer_save(bmain, str, op->reports); - BKE_reportf(op->reports, RPT_INFO, "Copied %d selected data-blocks", num_ids); + BKE_reportf(op->reports, + RPT_INFO, + num_ids == 1 ? "Copied %d selected data-block" : + "Copied %d selected data-blocks", + num_ids); return OPERATOR_FINISHED; } @@ -804,7 +808,11 @@ static int outliner_id_paste_exec(bContext *C, wmOperator *op) WM_event_add_notifier(C, NC_WINDOW, NULL); - BKE_reportf(op->reports, RPT_INFO, "%d data-blocks pasted", num_pasted); + BKE_reportf(op->reports, + RPT_INFO, + num_pasted == 1 ? "%d data-block pasted" : + "%d data-blocks pasted", + num_pasted); return OPERATOR_FINISHED; } @@ -2257,7 +2265,11 @@ static int outliner_orphans_purge_exec(bContext *C, wmOperator *op) BKE_id_multi_tagged_delete(bmain); - BKE_reportf(op->reports, RPT_INFO, "Deleted %d data-blocks", num_tagged[INDEX_ID_NULL]); + BKE_reportf(op->reports, + RPT_INFO, + num_tagged[INDEX_ID_NULL] == 1 ? "Deleted %d data-block" : + "Deleted %d data-blocks", + num_tagged[INDEX_ID_NULL]); /* XXX: tree management normally happens from draw_outliner(), but when * you're clicking to fast on Delete object from context menu in diff --git a/source/blender/editors/space_view3d/view3d_ops.c b/source/blender/editors/space_view3d/view3d_ops.c index e5a145b0411..37eea6b03d7 100644 --- a/source/blender/editors/space_view3d/view3d_ops.c +++ b/source/blender/editors/space_view3d/view3d_ops.c @@ -79,7 +79,11 @@ static int view3d_copybuffer_exec(bContext *C, wmOperator *op) BLI_make_file_string("/", str, BKE_tempdir_base(), "copybuffer.blend"); BKE_copybuffer_save(bmain, str, op->reports); - BKE_reportf(op->reports, RPT_INFO, "Copied %d selected objects", num_copied); + BKE_reportf(op->reports, + RPT_INFO, + num_copied == 1 ? "Copied %d selected object" : + "Copied %d selected objects", + num_copied); return OPERATOR_FINISHED; } @@ -118,7 +122,11 @@ static int view3d_pastebuffer_exec(bContext *C, wmOperator *op) WM_event_add_notifier(C, NC_WINDOW, NULL); - BKE_reportf(op->reports, RPT_INFO, "%d objects pasted", num_pasted); + BKE_reportf(op->reports, + RPT_INFO, + num_pasted == 1 ? "%d object pasted" : + "%d objects pasted", + num_pasted); return OPERATOR_FINISHED; } |