mirror of
https://github.com/git/git.git
synced 2024-05-05 07:06:34 +02:00
convert.c: mark more strings for translation
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
Junio C Hamano
parent
aad6fddb0c
commit
d26a328eaf
38
convert.c
38
convert.c
|
|
@ -190,7 +190,7 @@ static enum eol output_eol(enum crlf_action crlf_action)
|
|||
/* fall through */
|
||||
return text_eol_is_crlf() ? EOL_CRLF : EOL_LF;
|
||||
}
|
||||
warning("illegal crlf_action %d", (int)crlf_action);
|
||||
warning(_("illegal crlf_action %d"), (int)crlf_action);
|
||||
return core_eol;
|
||||
}
|
||||
|
||||
|
|
@ -207,7 +207,7 @@ static void check_global_conv_flags_eol(const char *path, enum crlf_action crlf_
|
|||
else if (conv_flags & CONV_EOL_RNDTRP_WARN)
|
||||
warning(_("CRLF will be replaced by LF in %s.\n"
|
||||
"The file will have its original line"
|
||||
" endings in your working directory."), path);
|
||||
" endings in your working directory"), path);
|
||||
} else if (old_stats->lonelf && !new_stats->lonelf ) {
|
||||
/*
|
||||
* CRLFs would be added by checkout
|
||||
|
|
@ -217,7 +217,7 @@ static void check_global_conv_flags_eol(const char *path, enum crlf_action crlf_
|
|||
else if (conv_flags & CONV_EOL_RNDTRP_WARN)
|
||||
warning(_("LF will be replaced by CRLF in %s.\n"
|
||||
"The file will have its original line"
|
||||
" endings in your working directory."), path);
|
||||
" endings in your working directory"), path);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -492,7 +492,7 @@ static int encode_to_worktree(const char *path, const char *src, size_t src_len,
|
|||
dst = reencode_string_len(src, src_len, enc, default_encoding,
|
||||
&dst_len);
|
||||
if (!dst) {
|
||||
error("failed to encode '%s' from %s to %s",
|
||||
error(_("failed to encode '%s' from %s to %s"),
|
||||
path, default_encoding, enc);
|
||||
return 0;
|
||||
}
|
||||
|
|
@ -670,7 +670,8 @@ static int filter_buffer_or_fd(int in, int out, void *data)
|
|||
|
||||
if (start_command(&child_process)) {
|
||||
strbuf_release(&cmd);
|
||||
return error("cannot fork to run external filter '%s'", params->cmd);
|
||||
return error(_("cannot fork to run external filter '%s'"),
|
||||
params->cmd);
|
||||
}
|
||||
|
||||
sigchain_push(SIGPIPE, SIG_IGN);
|
||||
|
|
@ -689,13 +690,14 @@ static int filter_buffer_or_fd(int in, int out, void *data)
|
|||
if (close(child_process.in))
|
||||
write_err = 1;
|
||||
if (write_err)
|
||||
error("cannot feed the input to external filter '%s'", params->cmd);
|
||||
error(_("cannot feed the input to external filter '%s'"),
|
||||
params->cmd);
|
||||
|
||||
sigchain_pop(SIGPIPE);
|
||||
|
||||
status = finish_command(&child_process);
|
||||
if (status)
|
||||
error("external filter '%s' failed %d", params->cmd, status);
|
||||
error(_("external filter '%s' failed %d"), params->cmd, status);
|
||||
|
||||
strbuf_release(&cmd);
|
||||
return (write_err || status);
|
||||
|
|
@ -730,13 +732,13 @@ static int apply_single_file_filter(const char *path, const char *src, size_t le
|
|||
return 0; /* error was already reported */
|
||||
|
||||
if (strbuf_read(&nbuf, async.out, len) < 0) {
|
||||
err = error("read from external filter '%s' failed", cmd);
|
||||
err = error(_("read from external filter '%s' failed"), cmd);
|
||||
}
|
||||
if (close(async.out)) {
|
||||
err = error("read from external filter '%s' failed", cmd);
|
||||
err = error(_("read from external filter '%s' failed"), cmd);
|
||||
}
|
||||
if (finish_async(&async)) {
|
||||
err = error("external filter '%s' failed", cmd);
|
||||
err = error(_("external filter '%s' failed"), cmd);
|
||||
}
|
||||
|
||||
if (!err) {
|
||||
|
|
@ -790,7 +792,7 @@ static void handle_filter_error(const struct strbuf *filter_status,
|
|||
* Something went wrong with the protocol filter.
|
||||
* Force shutdown and restart if another blob requires filtering.
|
||||
*/
|
||||
error("external filter '%s' failed", entry->subprocess.cmd);
|
||||
error(_("external filter '%s' failed"), entry->subprocess.cmd);
|
||||
subprocess_stop(&subprocess_map, &entry->subprocess);
|
||||
free(entry);
|
||||
}
|
||||
|
|
@ -838,7 +840,7 @@ static int apply_multi_file_filter(const char *path, const char *src, size_t len
|
|||
else if (wanted_capability & CAP_SMUDGE)
|
||||
filter_type = "smudge";
|
||||
else
|
||||
die("unexpected filter type");
|
||||
die(_("unexpected filter type"));
|
||||
|
||||
sigchain_push(SIGPIPE, SIG_IGN);
|
||||
|
||||
|
|
@ -849,7 +851,7 @@ static int apply_multi_file_filter(const char *path, const char *src, size_t len
|
|||
|
||||
err = strlen(path) > LARGE_PACKET_DATA_MAX - strlen("pathname=\n");
|
||||
if (err) {
|
||||
error("path name too long for external filter");
|
||||
error(_("path name too long for external filter"));
|
||||
goto done;
|
||||
}
|
||||
|
||||
|
|
@ -923,8 +925,8 @@ int async_query_available_blobs(const char *cmd, struct string_list *available_p
|
|||
assert(subprocess_map_initialized);
|
||||
entry = (struct cmd2process *)subprocess_find_entry(&subprocess_map, cmd);
|
||||
if (!entry) {
|
||||
error("external filter '%s' is not available anymore although "
|
||||
"not all paths have been filtered", cmd);
|
||||
error(_("external filter '%s' is not available anymore although "
|
||||
"not all paths have been filtered"), cmd);
|
||||
return 0;
|
||||
}
|
||||
process = &entry->subprocess.process;
|
||||
|
|
@ -1395,7 +1397,7 @@ int convert_to_git(const struct index_state *istate,
|
|||
|
||||
ret |= apply_filter(path, src, len, -1, dst, ca.drv, CAP_CLEAN, NULL);
|
||||
if (!ret && ca.drv && ca.drv->required)
|
||||
die("%s: clean filter '%s' failed", path, ca.drv->name);
|
||||
die(_("%s: clean filter '%s' failed"), path, ca.drv->name);
|
||||
|
||||
if (ret && dst) {
|
||||
src = dst->buf;
|
||||
|
|
@ -1429,7 +1431,7 @@ void convert_to_git_filter_fd(const struct index_state *istate,
|
|||
assert(ca.drv->clean || ca.drv->process);
|
||||
|
||||
if (!apply_filter(path, NULL, 0, fd, dst, ca.drv, CAP_CLEAN, NULL))
|
||||
die("%s: clean filter '%s' failed", path, ca.drv->name);
|
||||
die(_("%s: clean filter '%s' failed"), path, ca.drv->name);
|
||||
|
||||
encode_to_git(path, dst->buf, dst->len, dst, ca.working_tree_encoding, conv_flags);
|
||||
crlf_to_git(istate, path, dst->buf, dst->len, dst, ca.crlf_action, conv_flags);
|
||||
|
|
@ -1472,7 +1474,7 @@ static int convert_to_working_tree_internal(const char *path, const char *src,
|
|||
ret_filter = apply_filter(
|
||||
path, src, len, -1, dst, ca.drv, CAP_SMUDGE, dco);
|
||||
if (!ret_filter && ca.drv && ca.drv->required)
|
||||
die("%s: smudge filter %s failed", path, ca.drv->name);
|
||||
die(_("%s: smudge filter %s failed"), path, ca.drv->name);
|
||||
|
||||
return ret | ret_filter;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -583,7 +583,7 @@ test_expect_success PERL 'process filter should restart after unexpected write f
|
|||
git checkout --quiet --no-progress . 2>git-stderr.log &&
|
||||
|
||||
grep "smudge write error at" git-stderr.log &&
|
||||
grep "error: external filter" git-stderr.log &&
|
||||
test_i18ngrep "error: external filter" git-stderr.log &&
|
||||
|
||||
cat >expected.log <<-EOF &&
|
||||
START
|
||||
|
|
|
|||
Loading…
Reference in New Issue