From: Derrick Stolee <stolee@gmail.com>
Date: Mon, 02 Jul 2018 20:32:10 GMT
Subject: Re: [PATCH 08/23] commit-graph.c: mark more strings for translation
Message-ID: <bf4c5872-aca8-899d-2175-ae3f4eea7fad@gmail.com>
In-Reply-To: <20180630090818.28937-9-pclouds@gmail.com>

On 6/30/2018 5:08 AM, Nguyễn Thái Ngọc Duy wrote:
> Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
> ---
>   commit-graph.c | 20 ++++++++++----------
>   1 file changed, 10 insertions(+), 10 deletions(-)
>
> diff --git a/commit-graph.c b/commit-graph.c
> index b63a1fc85e..c8d521923c 100644
> --- a/commit-graph.c
> +++ b/commit-graph.c
> @@ -77,28 +77,28 @@ struct commit_graph *load_commit_graph_one(const char *graph_file)
>   
>   	if (graph_size < GRAPH_MIN_SIZE) {
>   		close(fd);
> -		die("graph file %s is too small", graph_file);
> +		die(_("graph file %s is too small"), graph_file);
>   	}
>   	graph_map = xmmap(NULL, graph_size, PROT_READ, MAP_PRIVATE, fd, 0);
>   	data = (const unsigned char *)graph_map;
>   
>   	graph_signature = get_be32(data);
>   	if (graph_signature != GRAPH_SIGNATURE) {
> -		error("graph signature %X does not match signature %X",
> +		error(_("graph signature %X does not match signature %X"),
>   		      graph_signature, GRAPH_SIGNATURE);
>   		goto cleanup_fail;
>   	}
>   
>   	graph_version = *(unsigned char*)(data + 4);
>   	if (graph_version != GRAPH_VERSION) {
> -		error("graph version %X does not match version %X",
> +		error(_("graph version %X does not match version %X"),
>   		      graph_version, GRAPH_VERSION);
>   		goto cleanup_fail;
>   	}
>   
>   	hash_version = *(unsigned char*)(data + 5);
>   	if (hash_version != GRAPH_OID_VERSION) {
> -		error("hash version %X does not match version %X",
> +		error(_("hash version %X does not match version %X"),
>   		      hash_version, GRAPH_OID_VERSION);
>   		goto cleanup_fail;
>   	}
> @@ -122,7 +122,7 @@ struct commit_graph *load_commit_graph_one(const char *graph_file)
>   		chunk_lookup += GRAPH_CHUNKLOOKUP_WIDTH;
>   
>   		if (chunk_offset > graph_size - GIT_MAX_RAWSZ) {
> -			error("improper chunk offset %08x%08x", (uint32_t)(chunk_offset >> 32),
> +			error(_("improper chunk offset %08x%08x"), (uint32_t)(chunk_offset >> 32),
>   			      (uint32_t)chunk_offset);
>   			goto cleanup_fail;
>   		}
> @@ -158,7 +158,7 @@ struct commit_graph *load_commit_graph_one(const char *graph_file)
>   		}
>   
>   		if (chunk_repeated) {
> -			error("chunk id %08x appears multiple times", chunk_id);
> +			error(_("chunk id %08x appears multiple times"), chunk_id);
>   			goto cleanup_fail;
>   		}
>   
> @@ -244,7 +244,7 @@ static struct commit_list **insert_parent_or_die(struct commit_graph *g,
>   	hashcpy(oid.hash, g->chunk_oid_lookup + g->hash_len * pos);
>   	c = lookup_commit(&oid);
>   	if (!c)
> -		die("could not find commit %s", oid_to_hex(&oid));
> +		die(_("could not find commit %s"), oid_to_hex(&oid));
>   	c->graph_pos = pos;
>   	return &commit_list_insert(c, pptr)->next;
>   }
> @@ -537,7 +537,7 @@ static int add_packed_commits(const struct object_id *oid,
>   
>   	oi.typep = &type;
>   	if (packed_object_info(the_repository, pack, offset, &oi) < 0)
> -		die("unable to get type of object %s", oid_to_hex(oid));
> +		die(_("unable to get type of object %s"), oid_to_hex(oid));
>   
>   	if (type != OBJ_COMMIT)
>   		return 0;
> @@ -683,9 +683,9 @@ void write_commit_graph(const char *obj_dir,
>   			strbuf_addstr(&packname, pack_indexes[i]);
>   			p = add_packed_git(packname.buf, packname.len, 1);
>   			if (!p)
> -				die("error adding pack %s", packname.buf);
> +				die(_("error adding pack %s"), packname.buf);
>   			if (open_pack_index(p))
> -				die("error opening index for %s", packname.buf);
> +				die(_("error opening index for %s"), packname.buf);
>   			for_each_object_in_pack(p, add_packed_commits, &oids);
>   			close_pack(p);
>   		}

These all look good to me. Thanks!