Re: [PATCH 02/22] archive-zip.c: mark more strings for translation

[brian m. carlson]

On Sat, Jun 02, 2018 at 08:17:47AM +0200, Duy Nguyen wrote:
> On Sat, Jun 2, 2018 at 6:32 AM, Nguyễn Thái Ngọc Duy  
> wrote:
> > if (pathlen > 0x) {
> > -   return error("path too long (%d chars, SHA1: %s): %s",
> > +   return error(_("path too long (%d chars, SHA1: %s): %s"),
> > (int)pathlen, oid_to_hex(oid), path);
> 
> Off topic. Brian, do we have a common term to use here (i.e. in user
> facing messages) instead of "SHA1" after we move away from it? Is it
> still "object name", or "hash" or some other fancy term?

You could say "object ID" or "object" here.  It should be clear from
context what that means.  I tend to use "hash" for things which are not
necessarily object IDs (e.g. pack hash).
-- 
brian m. carlson: Houston, Texas, US
OpenPGP: https://keybase.io/bk2204


signature.asc
Description: PGP signature

Re: [PATCH 02/22] archive-zip.c: mark more strings for translation

[Duy Nguyen]

On Sat, Jun 2, 2018 at 6:32 AM, Nguyễn Thái Ngọc Duy  wrote:
> if (pathlen > 0x) {
> -   return error("path too long (%d chars, SHA1: %s): %s",
> +   return error(_("path too long (%d chars, SHA1: %s): %s"),
> (int)pathlen, oid_to_hex(oid), path);

Off topic. Brian, do we have a common term to use here (i.e. in user
facing messages) instead of "SHA1" after we move away from it? Is it
still "object name", or "hash" or some other fancy term?
-- 
Duy

[PATCH 02/22] archive-zip.c: mark more strings for translation

[Nguyễn Thái Ngọc Duy]

One 'P' is lower cased because we normally start an error message with
lowercase.

Signed-off-by: Nguyễn Thái Ngọc Duy 
---
 archive-zip.c | 14 +++---
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/archive-zip.c b/archive-zip.c
index 74f3fe9103..7ad46d8854 100644
--- a/archive-zip.c
+++ b/archive-zip.c
@@ -309,11 +309,11 @@ static int write_zip_entry(struct archiver_args *args,
if (is_utf8(path))
flags |= ZIP_UTF8;
else
-   warning("Path is not valid UTF-8: %s", path);
+   warning(_("path is not valid UTF-8: %s"), path);
}
 
if (pathlen > 0x) {
-   return error("path too long (%d chars, SHA1: %s): %s",
+   return error(_("path too long (%d chars, SHA1: %s): %s"),
(int)pathlen, oid_to_hex(oid), path);
}
 
@@ -340,7 +340,7 @@ static int write_zip_entry(struct archiver_args *args,
size > big_file_threshold) {
stream = open_istream(oid, , , NULL);
if (!stream)
-   return error("cannot stream blob %s",
+   return error(_("cannot stream blob %s"),
 oid_to_hex(oid));
flags |= ZIP_STREAM;
out = buffer = NULL;
@@ -348,7 +348,7 @@ static int write_zip_entry(struct archiver_args *args,
buffer = object_file_to_archive(args, path, oid, mode,
, );
if (!buffer)
-   return error("cannot read %s",
+   return error(_("cannot read %s"),
 oid_to_hex(oid));
crc = crc32(crc, buffer, size);
is_binary = entry_is_binary(path_without_prefix,
@@ -357,7 +357,7 @@ static int write_zip_entry(struct archiver_args *args,
}
compressed_size = (method == 0) ? size : 0;
} else {
-   return error("unsupported file mode: 0%o (SHA1: %s)", mode,
+   return error(_("unsupported file mode: 0%o (SHA1: %s)"), mode,
oid_to_hex(oid));
}
 
@@ -466,7 +466,7 @@ static int write_zip_entry(struct archiver_args *args,
zstream.avail_in = readlen;
result = git_deflate(, 0);
if (result != Z_OK)
-   die("deflate error (%d)", result);
+   die(_("deflate error (%d)"), result);
out_len = zstream.next_out - compressed;
 
if (out_len > 0) {
@@ -601,7 +601,7 @@ static void dos_time(timestamp_t *timestamp, int *dos_date, 
int *dos_time)
struct tm *t;
 
if (date_overflows(*timestamp))
-   die("timestamp too large for this system: %"PRItime,
+   die(_("timestamp too large for this system: %"PRItime),
*timestamp);
time = (time_t)*timestamp;
t = localtime();
-- 
2.18.0.rc0.309.g77c7720784