Re: [PATCH] i18n: remove i18n from tag reflog message
- From
Junio C Hamano <gitster@pobox.com>
- Date
- May 1, 2017, 01:45 UTC
- Message-ID
- <xmqqwpa1ic4e.fsf@gitster.mtv.corp.google.com>
- In-Reply-To
- <20170429100253.4710-1-jn.avila@free.fr>
Jean-Noel Avila <jn.avila@free.fr> writes:
> The building of the reflog message is using strbuf, which is not > friendly with internationalization frameworks. No other reflog > messages are translated right now and switching all the messages to > i18n would require a major rework of the way the messages are built.
Thanks for spotting. Before we declare that reflog messages are for i18n, we'd need to either drop (or redesign the implementation of) the "checkout -" feature, which relies on the exact phrasing of how reflog entries from "git checkout" looks like.
Will queue and merge down to 'master' quickly.
Show 53 quoted lines
>
> Signed-off-by: Jean-Noel Avila <jn.avila@free.fr>
> ---
> builtin/tag.c | 12 ++++++------
> 1 file changed, 6 insertions(+), 6 deletions(-)
>
> diff --git a/builtin/tag.c b/builtin/tag.c
> index 222404522..bdf1e88e9 100644
> --- a/builtin/tag.c
> +++ b/builtin/tag.c
> @@ -309,7 +309,7 @@ static void create_reflog_msg(const unsigned char *sha1, struct strbuf *sb)
> if (rla) {
> strbuf_addstr(sb, rla);
> } else {
> - strbuf_addstr(sb, _("tag: tagging "));
> + strbuf_addstr(sb, "tag: tagging ");
> strbuf_add_unique_abbrev(sb, sha1, DEFAULT_ABBREV);
> }
>
> @@ -317,14 +317,14 @@ static void create_reflog_msg(const unsigned char *sha1, struct strbuf *sb)
> type = sha1_object_info(sha1, NULL);
> switch (type) {
> default:
> - strbuf_addstr(sb, _("object of unknown type"));
> + strbuf_addstr(sb, "object of unknown type");
> break;
> case OBJ_COMMIT:
> if ((buf = read_sha1_file(sha1, &type, &size)) != NULL) {
> subject_len = find_commit_subject(buf, &subject_start);
> strbuf_insert(sb, sb->len, subject_start, subject_len);
> } else {
> - strbuf_addstr(sb, _("commit object"));
> + strbuf_addstr(sb, "commit object");
> }
> free(buf);
>
> @@ -332,13 +332,13 @@ static void create_reflog_msg(const unsigned char *sha1, struct strbuf *sb)
> strbuf_addf(sb, ", %s", show_date(c->date, 0, DATE_MODE(SHORT)));
> break;
> case OBJ_TREE:
> - strbuf_addstr(sb, _("tree object"));
> + strbuf_addstr(sb, "tree object");
> break;
> case OBJ_BLOB:
> - strbuf_addstr(sb, _("blob object"));
> + strbuf_addstr(sb, "blob object");
> break;
> case OBJ_TAG:
> - strbuf_addstr(sb, _("other tag object"));
> + strbuf_addstr(sb, "other tag object");
> break;
> }
> strbuf_addch(sb, ')');