Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrecht Van Lommel <brechtvanlommel@gmail.com>2019-10-02 13:52:58 +0300
committerBrecht Van Lommel <brechtvanlommel@gmail.com>2019-10-02 13:54:56 +0300
commit01c824ac88a0ff95a26c26be09f7a8853e47e446 (patch)
treecb7519ee3991be58218a14d9bd907c77fc79ee19 /source/blender/editors/space_outliner
parenta434b30667c02609c307d2871b27f24a64ff3f44 (diff)
Revert "UI: use correct singular and plural nouns in report messages"
Convention is to use (s) postfix for cases where there can be one or multiple, so stay consistent with that. This reverts commit 3e8276311ed17d12e8b47b4fe8e2f68c1ce8c603.
Diffstat (limited to 'source/blender/editors/space_outliner')
-rw-r--r--source/blender/editors/space_outliner/outliner_edit.c18
1 files changed, 3 insertions, 15 deletions
diff --git a/source/blender/editors/space_outliner/outliner_edit.c b/source/blender/editors/space_outliner/outliner_edit.c
index c81d292a859..c55140db46f 100644
--- a/source/blender/editors/space_outliner/outliner_edit.c
+++ b/source/blender/editors/space_outliner/outliner_edit.c
@@ -770,11 +770,7 @@ 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,
- num_ids == 1 ? "Copied %d selected data-block" :
- "Copied %d selected data-blocks",
- num_ids);
+ BKE_reportf(op->reports, RPT_INFO, "Copied %d selected data-block(s)", num_ids);
return OPERATOR_FINISHED;
}
@@ -808,11 +804,7 @@ static int outliner_id_paste_exec(bContext *C, wmOperator *op)
WM_event_add_notifier(C, NC_WINDOW, NULL);
- BKE_reportf(op->reports,
- RPT_INFO,
- num_pasted == 1 ? "%d data-block pasted" :
- "%d data-blocks pasted",
- num_pasted);
+ BKE_reportf(op->reports, RPT_INFO, "%d data-block(s) pasted", num_pasted);
return OPERATOR_FINISHED;
}
@@ -2265,11 +2257,7 @@ static int outliner_orphans_purge_exec(bContext *C, wmOperator *op)
BKE_id_multi_tagged_delete(bmain);
- 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]);
+ BKE_reportf(op->reports, RPT_INFO, "Deleted %d data-block(s)", 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