mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

connect.c: mark more strings for translation

Browse Source 
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Nguyễn Thái Ngọc Duy
2018-07-21 09:49:28 +02:00
committed by Junio C Hamano
parent a769bfc74f
commit aad6fddb0c
2 changed files with 42 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

74
connect.c
View File

@ -78,7 +78,7 @@ int server_supports_v2(const char *c, int die_on_error)
} }
if (die_on_error) if (die_on_error)
die("server doesn't support '%s'", c); die(_("server doesn't support '%s'"), c);
return 0; return 0;
} }
@ -100,7 +100,7 @@ int server_supports_feature(const char *c, const char *feature,
} }
if (die_on_error) if (die_on_error)
die("server doesn't support feature '%s'", feature); die(_("server doesn't support feature '%s'"), feature);
return 0; return 0;
} }
@ -111,7 +111,7 @@ static void process_capabilities_v2(struct packet_reader *reader)
argv_array_push(&server_capabilities_v2, reader->line); argv_array_push(&server_capabilities_v2, reader->line);
if (reader->status != PACKET_READ_FLUSH) if (reader->status != PACKET_READ_FLUSH)
die("expected flush after capabilities"); die(_("expected flush after capabilities"));
} }
enum protocol_version discover_version(struct packet_reader *reader) enum protocol_version discover_version(struct packet_reader *reader)
@ -230,7 +230,7 @@ static int process_dummy_ref(const char *line)
static void check_no_capabilities(const char *line, int len) static void check_no_capabilities(const char *line, int len)
{ {
if (strlen(line) != len) if (strlen(line) != len)
warning("ignoring capabilities after first line '%s'", warning(_("ignoring capabilities after first line '%s'"),
line + strlen(line)); line + strlen(line));
} }
@ -249,7 +249,7 @@ static int process_ref(const char *line, int len, struct ref ***list,
if (extra_have && !strcmp(name, ".have")) { if (extra_have && !strcmp(name, ".have")) {
oid_array_append(extra_have, &old_oid); oid_array_append(extra_have, &old_oid);
} else if (!strcmp(name, "capabilities^{}")) { } else if (!strcmp(name, "capabilities^{}")) {
die("protocol error: unexpected capabilities^{}"); die(_("protocol error: unexpected capabilities^{}"));
} else if (check_ref(name, flags)) { } else if (check_ref(name, flags)) {
struct ref *ref = alloc_ref(name); struct ref *ref = alloc_ref(name);
oidcpy(&ref->old_oid, &old_oid); oidcpy(&ref->old_oid, &old_oid);
@ -270,9 +270,9 @@ static int process_shallow(const char *line, int len,
return 0; return 0;
if (get_oid_hex(arg, &old_oid)) if (get_oid_hex(arg, &old_oid))
die("protocol error: expected shallow sha-1, got '%s'", arg); die(_("protocol error: expected shallow sha-1, got '%s'"), arg);
if (!shallow_points) if (!shallow_points)
die("repository on the other end cannot be shallow"); die(_("repository on the other end cannot be shallow"));
oid_array_append(shallow_points, &old_oid); oid_array_append(shallow_points, &old_oid);
check_no_capabilities(line, len); check_no_capabilities(line, len);
return 1; return 1;
@ -307,13 +307,13 @@ struct ref **get_remote_heads(struct packet_reader *reader,
case PACKET_READ_NORMAL: case PACKET_READ_NORMAL:
len = reader->pktlen; len = reader->pktlen;
if (len > 4 && skip_prefix(reader->line, "ERR ", &arg)) if (len > 4 && skip_prefix(reader->line, "ERR ", &arg))
die("remote error: %s", arg); die(_("remote error: %s"), arg);
break; break;
case PACKET_READ_FLUSH: case PACKET_READ_FLUSH:
state = EXPECTING_DONE; state = EXPECTING_DONE;
break; break;
case PACKET_READ_DELIM: case PACKET_READ_DELIM:
die("invalid packet"); die(_("invalid packet"));
} }
switch (state) { switch (state) {
@ -333,7 +333,7 @@ struct ref **get_remote_heads(struct packet_reader *reader,
case EXPECTING_SHALLOW: case EXPECTING_SHALLOW:
if (process_shallow(reader->line, len, shallow_points)) if (process_shallow(reader->line, len, shallow_points))
break; break;
die("protocol error: unexpected '%s'", reader->line); die(_("protocol error: unexpected '%s'"), reader->line);
case EXPECTING_DONE: case EXPECTING_DONE:
break; break;
} }
@ -441,11 +441,11 @@ struct ref **get_remote_refs(int fd_out, struct packet_reader *reader,
/* Process response from server */ /* Process response from server */
while (packet_reader_read(reader) == PACKET_READ_NORMAL) { while (packet_reader_read(reader) == PACKET_READ_NORMAL) {
if (!process_ref_v2(reader->line, &list)) if (!process_ref_v2(reader->line, &list))
die("invalid ls-refs response: %s", reader->line); die(_("invalid ls-refs response: %s"), reader->line);
} }
if (reader->status != PACKET_READ_FLUSH) if (reader->status != PACKET_READ_FLUSH)
die("expected flush after ref listing"); die(_("expected flush after ref listing"));
return list; return list;
} }
@ -544,7 +544,7 @@ static enum protocol get_protocol(const char *name)
return PROTO_SSH; return PROTO_SSH;
if (!strcmp(name, "file")) if (!strcmp(name, "file"))
return PROTO_FILE; return PROTO_FILE;
die("protocol '%s' is not supported", name); die(_("protocol '%s' is not supported"), name);
} }
static char *host_end(char **hoststart, int removebrackets) static char *host_end(char **hoststart, int removebrackets)
@ -595,7 +595,7 @@ static void enable_keepalive(int sockfd)
int ka = 1; int ka = 1;
if (setsockopt(sockfd, SOL_SOCKET, SO_KEEPALIVE, &ka, sizeof(ka)) < 0) if (setsockopt(sockfd, SOL_SOCKET, SO_KEEPALIVE, &ka, sizeof(ka)) < 0)
error_errno("unable to set SO_KEEPALIVE on socket"); error_errno(_("unable to set SO_KEEPALIVE on socket"));
} }
#ifndef NO_IPV6 #ifndef NO_IPV6
@ -635,14 +635,15 @@ static int git_tcp_connect_sock(char *host, int flags)
hints.ai_protocol = IPPROTO_TCP; hints.ai_protocol = IPPROTO_TCP;
if (flags & CONNECT_VERBOSE) if (flags & CONNECT_VERBOSE)
fprintf(stderr, "Looking up %s ... ", host); fprintf(stderr, _("Looking up %s ... "), host);
gai = getaddrinfo(host, port, &hints, &ai); gai = getaddrinfo(host, port, &hints, &ai);
if (gai) if (gai)
die("unable to look up %s (port %s) (%s)", host, port, gai_strerror(gai)); die(_("unable to look up %s (port %s) (%s)"), host, port, gai_strerror(gai));
if (flags & CONNECT_VERBOSE) if (flags & CONNECT_VERBOSE)
fprintf(stderr, "done.\nConnecting to %s (port %s) ... ", host, port); /* TRANSLATORS: this is the end of "Looking up %s ... " */
fprintf(stderr, _("done.\nConnecting to %s (port %s) ... "), host, port);
for (ai0 = ai; ai; ai = ai->ai_next, cnt++) { for (ai0 = ai; ai; ai = ai->ai_next, cnt++) {
sockfd = socket(ai->ai_family, sockfd = socket(ai->ai_family,
@ -664,12 +665,13 @@ static int git_tcp_connect_sock(char *host, int flags)
freeaddrinfo(ai0); freeaddrinfo(ai0);
if (sockfd < 0) if (sockfd < 0)
die("unable to connect to %s:\n%s", host, error_message.buf); die(_("unable to connect to %s:\n%s"), host, error_message.buf);
enable_keepalive(sockfd); enable_keepalive(sockfd);
if (flags & CONNECT_VERBOSE) if (flags & CONNECT_VERBOSE)
fprintf_ln(stderr, "done."); /* TRANSLATORS: this is the end of "Connecting to %s (port %s) ... " */
fprintf_ln(stderr, _("done."));
strbuf_release(&error_message); strbuf_release(&error_message);
@ -696,22 +698,23 @@ static int git_tcp_connect_sock(char *host, int flags)
get_host_and_port(&host, &port); get_host_and_port(&host, &port);
if (flags & CONNECT_VERBOSE) if (flags & CONNECT_VERBOSE)
fprintf(stderr, "Looking up %s ... ", host); fprintf(stderr, _("Looking up %s ... "), host);
he = gethostbyname(host); he = gethostbyname(host);
if (!he) if (!he)
die("unable to look up %s (%s)", host, hstrerror(h_errno)); die(_("unable to look up %s (%s)"), host, hstrerror(h_errno));
nport = strtoul(port, &ep, 10); nport = strtoul(port, &ep, 10);
if ( ep == port || *ep ) { if ( ep == port || *ep ) {
/* Not numeric */ /* Not numeric */
struct servent *se = getservbyname(port,"tcp"); struct servent *se = getservbyname(port,"tcp");
if ( !se ) if ( !se )
die("unknown port %s", port); die(_("unknown port %s"), port);
nport = se->s_port; nport = se->s_port;
} }
if (flags & CONNECT_VERBOSE) if (flags & CONNECT_VERBOSE)
fprintf(stderr, "done.\nConnecting to %s (port %s) ... ", host, port); /* TRANSLATORS: this is the end of "Looking up %s ... " */
fprintf(stderr, _("done.\nConnecting to %s (port %s) ... "), host, port);
for (cnt = 0, ap = he->h_addr_list; *ap; ap++, cnt++) { for (cnt = 0, ap = he->h_addr_list; *ap; ap++, cnt++) {
memset(&sa, 0, sizeof sa); memset(&sa, 0, sizeof sa);
@ -739,12 +742,13 @@ static int git_tcp_connect_sock(char *host, int flags)
} }
if (sockfd < 0) if (sockfd < 0)
die("unable to connect to %s:\n%s", host, error_message.buf); die(_("unable to connect to %s:\n%s"), host, error_message.buf);
enable_keepalive(sockfd); enable_keepalive(sockfd);
if (flags & CONNECT_VERBOSE) if (flags & CONNECT_VERBOSE)
fprintf_ln(stderr, "done."); /* TRANSLATORS: this is the end of "Connecting to %s (port %s) ... " */
fprintf_ln(stderr, _("done."));
return sockfd; return sockfd;
} }
@ -841,9 +845,9 @@ static struct child_process *git_proxy_connect(int fd[2], char *host)
get_host_and_port(&host, &port); get_host_and_port(&host, &port);
if (looks_like_command_line_option(host)) if (looks_like_command_line_option(host))
die("strange hostname '%s' blocked", host); die(_("strange hostname '%s' blocked"), host);
if (looks_like_command_line_option(port)) if (looks_like_command_line_option(port))
die("strange port '%s' blocked", port); die(_("strange port '%s' blocked"), port);
proxy = xmalloc(sizeof(*proxy)); proxy = xmalloc(sizeof(*proxy));
child_process_init(proxy); child_process_init(proxy);
@ -853,7 +857,7 @@ static struct child_process *git_proxy_connect(int fd[2], char *host)
proxy->in = -1; proxy->in = -1;
proxy->out = -1; proxy->out = -1;
if (start_command(proxy)) if (start_command(proxy))
die("cannot start proxy %s", git_proxy_command); die(_("cannot start proxy %s"), git_proxy_command);
fd[0] = proxy->out; /* read from proxy stdout */ fd[0] = proxy->out; /* read from proxy stdout */
fd[1] = proxy->in; /* write to proxy stdin */ fd[1] = proxy->in; /* write to proxy stdin */
return proxy; return proxy;
@ -920,7 +924,7 @@ static enum protocol parse_connect_url(const char *url_orig, char **ret_host,
path = strchr(end, separator); path = strchr(end, separator);
if (!path || !*path) if (!path || !*path)
die("no path specified; see 'git help pull' for valid url syntax"); die(_("no path specified; see 'git help pull' for valid url syntax"));
/* /*
* null-terminate hostname and point path to ~ for URL's like this: * null-terminate hostname and point path to ~ for URL's like this:
@ -1115,7 +1119,7 @@ static void push_ssh_options(struct argv_array *args, struct argv_array *env,
case VARIANT_AUTO: case VARIANT_AUTO:
BUG("VARIANT_AUTO passed to push_ssh_options"); BUG("VARIANT_AUTO passed to push_ssh_options");
case VARIANT_SIMPLE: case VARIANT_SIMPLE:
die("ssh variant 'simple' does not support -4"); die(_("ssh variant 'simple' does not support -4"));
case VARIANT_SSH: case VARIANT_SSH:
case VARIANT_PLINK: case VARIANT_PLINK:
case VARIANT_PUTTY: case VARIANT_PUTTY:
@ -1127,7 +1131,7 @@ static void push_ssh_options(struct argv_array *args, struct argv_array *env,
case VARIANT_AUTO: case VARIANT_AUTO:
BUG("VARIANT_AUTO passed to push_ssh_options"); BUG("VARIANT_AUTO passed to push_ssh_options");
case VARIANT_SIMPLE: case VARIANT_SIMPLE:
die("ssh variant 'simple' does not support -6"); die(_("ssh variant 'simple' does not support -6"));
case VARIANT_SSH: case VARIANT_SSH:
case VARIANT_PLINK: case VARIANT_PLINK:
case VARIANT_PUTTY: case VARIANT_PUTTY:
@ -1144,7 +1148,7 @@ static void push_ssh_options(struct argv_array *args, struct argv_array *env,
case VARIANT_AUTO: case VARIANT_AUTO:
BUG("VARIANT_AUTO passed to push_ssh_options"); BUG("VARIANT_AUTO passed to push_ssh_options");
case VARIANT_SIMPLE: case VARIANT_SIMPLE:
die("ssh variant 'simple' does not support setting port"); die(_("ssh variant 'simple' does not support setting port"));
case VARIANT_SSH: case VARIANT_SSH:
argv_array_push(args, "-p"); argv_array_push(args, "-p");
break; break;
@ -1167,7 +1171,7 @@ static void fill_ssh_args(struct child_process *conn, const char *ssh_host,
enum ssh_variant variant; enum ssh_variant variant;
if (looks_like_command_line_option(ssh_host)) if (looks_like_command_line_option(ssh_host))
die("strange hostname '%s' blocked", ssh_host); die(_("strange hostname '%s' blocked"), ssh_host);
ssh = get_ssh_command(); ssh = get_ssh_command();
if (ssh) { if (ssh) {
@ -1255,7 +1259,7 @@ struct child_process *git_connect(int fd[2], const char *url,
child_process_init(conn); child_process_init(conn);
if (looks_like_command_line_option(path)) if (looks_like_command_line_option(path))
die("strange pathname '%s' blocked", path); die(_("strange pathname '%s' blocked"), path);
strbuf_addstr(&cmd, prog); strbuf_addstr(&cmd, prog);
strbuf_addch(&cmd, ' '); strbuf_addch(&cmd, ' ');
@ -1300,7 +1304,7 @@ struct child_process *git_connect(int fd[2], const char *url,
argv_array_push(&conn->args, cmd.buf); argv_array_push(&conn->args, cmd.buf);
if (start_command(conn)) if (start_command(conn))
die("unable to fork"); die(_("unable to fork"));
fd[0] = conn->out; /* read from child's stdout */ fd[0] = conn->out; /* read from child's stdout */
fd[1] = conn->in; /* write to child's stdin */ fd[1] = conn->in; /* write to child's stdin */

6
t/t5570-git-daemon.sh
View File

@ -7,9 +7,9 @@ test_description='test fetching over git protocol'
start_git_daemon start_git_daemon
check_verbose_connect () { check_verbose_connect () {
grep -F "Looking up 127.0.0.1 ..." stderr && test_i18ngrep -F "Looking up 127.0.0.1 ..." stderr &&
grep -F "Connecting to 127.0.0.1 (port " stderr && test_i18ngrep -F "Connecting to 127.0.0.1 (port " stderr &&
grep -F "done." stderr test_i18ngrep -F "done." stderr
} }
test_expect_success 'setup repository' ' test_expect_success 'setup repository' '