undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

config.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:27 +02:00 committed by Junio C Hamano
parent 4f5b532d18
commit a769bfc74f
2 changed files with 37 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

72
config.c
View File

@ -116,12 +116,12 @@ static long config_buf_ftell(struct config_source *conf)
} }
#define MAX_INCLUDE_DEPTH 10 #define MAX_INCLUDE_DEPTH 10
static const char include_depth_advice[] = static const char include_depth_advice[] = N_(
"exceeded maximum include depth (%d) while including\n" "exceeded maximum include depth (%d) while including\n"
" %s\n" " %s\n"
"from\n" "from\n"
" %s\n" " %s\n"
"Do you have circular includes?"; "Do you have circular includes?");
static int handle_path_include(const char *path, struct config_include_data *inc) static int handle_path_include(const char *path, struct config_include_data *inc)
{ {
int ret = 0; int ret = 0;
@ -133,7 +133,7 @@ static int handle_path_include(const char *path, struct config_include_data *inc
expanded = expand_user_path(path, 0); expanded = expand_user_path(path, 0);
if (!expanded) if (!expanded)
return error("could not expand include path '%s'", path); return error(_("could not expand include path '%s'"), path);
path = expanded; path = expanded;
/* /*
@ -144,7 +144,7 @@ static int handle_path_include(const char *path, struct config_include_data *inc
char *slash; char *slash;
if (!cf || !cf->path) if (!cf || !cf->path)
return error("relative config includes must come from files"); return error(_("relative config includes must come from files"));
slash = find_last_dir_sep(cf->path); slash = find_last_dir_sep(cf->path);
if (slash) if (slash)
@ -155,7 +155,7 @@ static int handle_path_include(const char *path, struct config_include_data *inc
if (!access_or_die(path, R_OK, 0)) { if (!access_or_die(path, R_OK, 0)) {
if (++inc->depth > MAX_INCLUDE_DEPTH) if (++inc->depth > MAX_INCLUDE_DEPTH)
die(include_depth_advice, MAX_INCLUDE_DEPTH, path, die(_(include_depth_advice), MAX_INCLUDE_DEPTH, path,
!cf ? "<unknown>" : !cf ? "<unknown>" :
cf->name ? cf->name : cf->name ? cf->name :
"the command line"); "the command line");
@ -342,13 +342,13 @@ static int git_config_parse_key_1(const char *key, char **store_key, int *basele
if (last_dot == NULL || last_dot == key) { if (last_dot == NULL || last_dot == key) {
if (!quiet) if (!quiet)
error("key does not contain a section: %s", key); error(_("key does not contain a section: %s"), key);
return -CONFIG_NO_SECTION_OR_NAME; return -CONFIG_NO_SECTION_OR_NAME;
} }
if (!last_dot[1]) { if (!last_dot[1]) {
if (!quiet) if (!quiet)
error("key does not contain variable name: %s", key); error(_("key does not contain variable name: %s"), key);
return -CONFIG_NO_SECTION_OR_NAME; return -CONFIG_NO_SECTION_OR_NAME;
} }
@ -372,13 +372,13 @@ static int git_config_parse_key_1(const char *key, char **store_key, int *basele
if (!iskeychar(c) || if (!iskeychar(c) ||
(i == baselen + 1 && !isalpha(c))) { (i == baselen + 1 && !isalpha(c))) {
if (!quiet) if (!quiet)
error("invalid key: %s", key); error(_("invalid key: %s"), key);
goto out_free_ret_1; goto out_free_ret_1;
} }
c = tolower(c); c = tolower(c);
} else if (c == '\n') { } else if (c == '\n') {
if (!quiet) if (!quiet)
error("invalid key (newline): %s", key); error(_("invalid key (newline): %s"), key);
goto out_free_ret_1; goto out_free_ret_1;
} }
if (store_key) if (store_key)
@ -414,7 +414,7 @@ int git_config_parse_parameter(const char *text,
pair = strbuf_split_str(text, '=', 2); pair = strbuf_split_str(text, '=', 2);
if (!pair[0]) if (!pair[0])
return error("bogus config parameter: %s", text); return error(_("bogus config parameter: %s"), text);
if (pair[0]->len && pair[0]->buf[pair[0]->len - 1] == '=') { if (pair[0]->len && pair[0]->buf[pair[0]->len - 1] == '=') {
strbuf_setlen(pair[0], pair[0]->len - 1); strbuf_setlen(pair[0], pair[0]->len - 1);
@ -426,7 +426,7 @@ int git_config_parse_parameter(const char *text,
strbuf_trim(pair[0]); strbuf_trim(pair[0]);
if (!pair[0]->len) { if (!pair[0]->len) {
strbuf_list_free(pair); strbuf_list_free(pair);
return error("bogus config parameter: %s", text); return error(_("bogus config parameter: %s"), text);
} }
if (git_config_parse_key(pair[0]->buf, &canonical_name, NULL)) { if (git_config_parse_key(pair[0]->buf, &canonical_name, NULL)) {
@ -461,7 +461,7 @@ int git_config_from_parameters(config_fn_t fn, void *data)
envw = xstrdup(env); envw = xstrdup(env);
if (sq_dequote_to_argv(envw, &argv, &nr, &alloc) < 0) { if (sq_dequote_to_argv(envw, &argv, &nr, &alloc) < 0) {
ret = error("bogus format in %s", CONFIG_DATA_ENVIRONMENT); ret = error(_("bogus format in %s"), CONFIG_DATA_ENVIRONMENT);
goto out; goto out;
} }
@ -1154,7 +1154,7 @@ static int git_default_core_config(const char *var, const char *value)
else { else {
int abbrev = git_config_int(var, value); int abbrev = git_config_int(var, value);
if (abbrev < minimum_abbrev || abbrev > 40) if (abbrev < minimum_abbrev || abbrev > 40)
return error("abbrev length out of range: %d", abbrev); return error(_("abbrev length out of range: %d"), abbrev);
default_abbrev = abbrev; default_abbrev = abbrev;
} }
return 0; return 0;
@ -1271,7 +1271,7 @@ static int git_default_core_config(const char *var, const char *value)
comment_line_char = value[0]; comment_line_char = value[0];
auto_comment_line_char = 0; auto_comment_line_char = 0;
} else } else
return error("core.commentChar should only be one character"); return error(_("core.commentChar should only be one character"));
return 0; return 0;
} }
@ -1384,7 +1384,7 @@ static int git_default_branch_config(const char *var, const char *value)
else if (!strcmp(value, "always")) else if (!strcmp(value, "always"))
autorebase = AUTOREBASE_ALWAYS; autorebase = AUTOREBASE_ALWAYS;
else else
return error("malformed value for %s", var); return error(_("malformed value for %s"), var);
return 0; return 0;
} }
@ -1410,9 +1410,9 @@ static int git_default_push_config(const char *var, const char *value)
else if (!strcmp(value, "current")) else if (!strcmp(value, "current"))
push_default = PUSH_DEFAULT_CURRENT; push_default = PUSH_DEFAULT_CURRENT;
else { else {
error("malformed value for %s: %s", var, value); error(_("malformed value for %s: %s"), var, value);
return error("must be one of nothing, matching, simple, " return error(_("must be one of nothing, matching, simple, "
"upstream or current"); "upstream or current"));
} }
return 0; return 0;
} }
@ -1589,10 +1589,10 @@ int git_config_from_blob_oid(config_fn_t fn,
buf = read_object_file(oid, &type, &size); buf = read_object_file(oid, &type, &size);
if (!buf) if (!buf)
return error("unable to load config blob object '%s'", name); return error(_("unable to load config blob object '%s'"), name);
if (type != OBJ_BLOB) { if (type != OBJ_BLOB) {
free(buf); free(buf);
return error("reference '%s' does not point to a blob", name); return error(_("reference '%s' does not point to a blob"), name);
} }
ret = git_config_from_mem(fn, CONFIG_ORIGIN_BLOB, name, buf, size, data); ret = git_config_from_mem(fn, CONFIG_ORIGIN_BLOB, name, buf, size, data);
@ -1608,7 +1608,7 @@ static int git_config_from_blob_ref(config_fn_t fn,
struct object_id oid; struct object_id oid;
if (get_oid(name, &oid) < 0) if (get_oid(name, &oid) < 0)
return error("unable to resolve config blob '%s'", name); return error(_("unable to resolve config blob '%s'"), name);
return git_config_from_blob_oid(fn, name, &oid, data); return git_config_from_blob_oid(fn, name, &oid, data);
} }
@ -1638,7 +1638,7 @@ unsigned long git_env_ulong(const char *k, unsigned long val)
{ {
const char *v = getenv(k); const char *v = getenv(k);
if (v && !git_parse_ulong(v, &val)) if (v && !git_parse_ulong(v, &val))
die("failed to parse %s", k); die(_("failed to parse %s"), k);
return val; return val;
} }
@ -2372,7 +2372,7 @@ static int store_aux_event(enum config_event_t type,
if (type == CONFIG_EVENT_SECTION) { if (type == CONFIG_EVENT_SECTION) {
if (cf->var.len < 2 || cf->var.buf[cf->var.len - 1] != '.') if (cf->var.len < 2 || cf->var.buf[cf->var.len - 1] != '.')
return error("invalid section name '%s'", cf->var.buf); return error(_("invalid section name '%s'"), cf->var.buf);
/* Is this the section we were looking for? */ /* Is this the section we were looking for? */
store->is_keys_section = store->is_keys_section =
@ -2428,7 +2428,7 @@ static int store_aux(const char *key, const char *value, void *cb)
static int write_error(const char *filename) static int write_error(const char *filename)
{ {
error("failed to write new configuration file %s", filename); error(_("failed to write new configuration file %s"), filename);
/* Same error code as "failed to rename". */ /* Same error code as "failed to rename". */
return 4; return 4;
@ -2679,7 +2679,7 @@ int git_config_set_multivar_in_file_gently(const char *config_filename,
*/ */
fd = hold_lock_file_for_update(&lock, config_filename, 0); fd = hold_lock_file_for_update(&lock, config_filename, 0);
if (fd < 0) { if (fd < 0) {
error_errno("could not lock config file %s", config_filename); error_errno(_("could not lock config file %s"), config_filename);
ret = CONFIG_NO_LOCK; ret = CONFIG_NO_LOCK;
goto out_free; goto out_free;
} }
@ -2690,7 +2690,7 @@ int git_config_set_multivar_in_file_gently(const char *config_filename,
in_fd = open(config_filename, O_RDONLY); in_fd = open(config_filename, O_RDONLY);
if ( in_fd < 0 ) { if ( in_fd < 0 ) {
if ( ENOENT != errno ) { if ( ENOENT != errno ) {
error_errno("opening %s", config_filename); error_errno(_("opening %s"), config_filename);
ret = CONFIG_INVALID_FILE; /* same as "invalid config file" */ ret = CONFIG_INVALID_FILE; /* same as "invalid config file" */
goto out_free; goto out_free;
} }
@ -2725,7 +2725,7 @@ int git_config_set_multivar_in_file_gently(const char *config_filename,
store.value_regex = (regex_t*)xmalloc(sizeof(regex_t)); store.value_regex = (regex_t*)xmalloc(sizeof(regex_t));
if (regcomp(store.value_regex, value_regex, if (regcomp(store.value_regex, value_regex,
REG_EXTENDED)) { REG_EXTENDED)) {
error("invalid pattern: %s", value_regex); error(_("invalid pattern: %s"), value_regex);
FREE_AND_NULL(store.value_regex); FREE_AND_NULL(store.value_regex);
ret = CONFIG_INVALID_PATTERN; ret = CONFIG_INVALID_PATTERN;
goto out_free; goto out_free;
@ -2750,7 +2750,7 @@ int git_config_set_multivar_in_file_gently(const char *config_filename,
if (git_config_from_file_with_options(store_aux, if (git_config_from_file_with_options(store_aux,
config_filename, config_filename,
&store, &opts)) { &store, &opts)) {
error("invalid config file %s", config_filename); error(_("invalid config file %s"), config_filename);
ret = CONFIG_INVALID_FILE; ret = CONFIG_INVALID_FILE;
goto out_free; goto out_free;
} }
@ -2774,7 +2774,7 @@ int git_config_set_multivar_in_file_gently(const char *config_filename,
if (contents == MAP_FAILED) { if (contents == MAP_FAILED) {
if (errno == ENODEV && S_ISDIR(st.st_mode)) if (errno == ENODEV && S_ISDIR(st.st_mode))
errno = EISDIR; errno = EISDIR;
error_errno("unable to mmap '%s'", config_filename); error_errno(_("unable to mmap '%s'"), config_filename);
ret = CONFIG_INVALID_FILE; ret = CONFIG_INVALID_FILE;
contents = NULL; contents = NULL;
goto out_free; goto out_free;
@ -2783,7 +2783,7 @@ int git_config_set_multivar_in_file_gently(const char *config_filename,
in_fd = -1; in_fd = -1;
if (chmod(get_lock_file_path(&lock), st.st_mode & 07777) < 0) { if (chmod(get_lock_file_path(&lock), st.st_mode & 07777) < 0) {
error_errno("chmod on %s failed", get_lock_file_path(&lock)); error_errno(_("chmod on %s failed"), get_lock_file_path(&lock));
ret = CONFIG_NO_WRITE; ret = CONFIG_NO_WRITE;
goto out_free; goto out_free;
} }
@ -2868,7 +2868,7 @@ int git_config_set_multivar_in_file_gently(const char *config_filename,
} }
if (commit_lock_file(&lock) < 0) { if (commit_lock_file(&lock) < 0) {
error_errno("could not write config file %s", config_filename); error_errno(_("could not write config file %s"), config_filename);
ret = CONFIG_NO_WRITE; ret = CONFIG_NO_WRITE;
goto out_free; goto out_free;
} }
@ -2994,7 +2994,7 @@ static int git_config_copy_or_rename_section_in_file(const char *config_filename
memset(&store, 0, sizeof(store)); memset(&store, 0, sizeof(store));
if (new_name && !section_name_is_ok(new_name)) { if (new_name && !section_name_is_ok(new_name)) {
ret = error("invalid section name: %s", new_name); ret = error(_("invalid section name: %s"), new_name);
goto out_no_rollback; goto out_no_rollback;
} }
@ -3003,7 +3003,7 @@ static int git_config_copy_or_rename_section_in_file(const char *config_filename
out_fd = hold_lock_file_for_update(&lock, config_filename, 0); out_fd = hold_lock_file_for_update(&lock, config_filename, 0);
if (out_fd < 0) { if (out_fd < 0) {
ret = error("could not lock config file %s", config_filename); ret = error(_("could not lock config file %s"), config_filename);
goto out; goto out;
} }
@ -3021,7 +3021,7 @@ static int git_config_copy_or_rename_section_in_file(const char *config_filename
} }
if (chmod(get_lock_file_path(&lock), st.st_mode & 07777) < 0) { if (chmod(get_lock_file_path(&lock), st.st_mode & 07777) < 0) {
ret = error_errno("chmod on %s failed", ret = error_errno(_("chmod on %s failed"),
get_lock_file_path(&lock)); get_lock_file_path(&lock));
goto out; goto out;
} }
@ -3118,7 +3118,7 @@ static int git_config_copy_or_rename_section_in_file(const char *config_filename
config_file = NULL; config_file = NULL;
commit_and_out: commit_and_out:
if (commit_lock_file(&lock) < 0) if (commit_lock_file(&lock) < 0)
ret = error_errno("could not write config file %s", ret = error_errno(_("could not write config file %s"),
config_filename); config_filename);
out: out:
if (config_file) if (config_file)
@ -3161,7 +3161,7 @@ int git_config_copy_section(const char *old_name, const char *new_name)
#undef config_error_nonbool #undef config_error_nonbool
int config_error_nonbool(const char *var) int config_error_nonbool(const char *var)
{ {
return error("missing value for '%s'", var); return error(_("missing value for '%s'"), var);
} }
int parse_config_key(const char *var, int parse_config_key(const char *var,

2
t/t1305-config-include.sh
View File

@ -310,7 +310,7 @@ test_expect_success 'include cycles are detected' '
cycle cycle
EOF EOF
test_must_fail git config --get-all test.value 2>stderr && test_must_fail git config --get-all test.value 2>stderr &&
grep "exceeded maximum include depth" stderr test_i18ngrep "exceeded maximum include depth" stderr
' '
test_done test_done