merge(s): apply consistent punctuation to "up to date" messages
Although the various "Already up to date" messages resulting from merge attempts share identical phrasing, they use a mix of punctuation ranging from "." to "!" and even "Yeeah!", which leads to extra work for translators. Ease the job of translators by settling upon "." as punctuation for all such messages. While at it, take advantage of printf_ln() to further ease the translation task so translators need not worry about line termination, and fix a case of missing line termination in the (unused) merge_ort_nonrecursive() function. Suggested-by: Junio C Hamano <gitster@pobox.com> Signed-off-by: Eric Sunshine <sunshine@sunshineco.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Eric Sunshine committed
May 2, 2021 at 01:14 UTC
80cde95eecbc3e0812a92eaa7bcd534dd256ceab
4 files changed
+4
-4
builtin/merge.c
+1
-1
@@ -1610,7 +1610,7 @@ int cmd_merge(int argc, const char **argv, const char *prefix)
1610
}
1611
}
1612
if (up_to_date) {
1613
- finish_up_to_date(_("Already up to date. Yeeah!"));
1613
+ finish_up_to_date(_("Already up to date."));
1614
goto done;
1615
}
1616
}
merge-ort-wrappers.c
+1
-1
@@ -30,7 +30,7 @@ int merge_ort_nonrecursive(struct merge_options *opt,
30
return -1;
31
32
if (oideq(&merge_base->object.oid, &merge->object.oid)) {
33
- printf(_("Already up to date!"));
33
+ printf_ln(_("Already up to date."));
34
return 1;
35
}
36
merge-recursive.c
+1
-1
@@ -3432,7 +3432,7 @@ static int merge_trees_internal(struct merge_options *opt,
3432
}
3433
3434
if (oideq(&merge_base->object.oid, &merge->object.oid)) {
3435
- output(opt, 0, _("Already up to date!"));
3435
+ output(opt, 0, _("Already up to date."));
3436
*result = head;
3437
return 1;
3438
}
notes-merge.c
+1
-1
@@ -628,7 +628,7 @@ int notes_merge(struct notes_merge_options *o,
628
if (oideq(&remote->object.oid, base_oid)) {
629
/* Already merged; result == local commit */
630
if (o->verbosity >= 2)
631
- printf("Already up to date!\n");
631
+ printf_ln("Already up to date.");
632
oidcpy(result_oid, &local->object.oid);
633
goto found_result;
634
}