On Wed, Feb 24, 2016 at 01:48:11PM +0100, Johannes Schindelin wrote:
> + die("not in a git directory");
Maybe wrap this string with _() for translation? Then we can pile this
patch on top to fix the rest in builtin/config.c.
-- 8< --
Subject: [PATCH] builtin/config.c: mark strings for translation
Signed-off-by: Nguyễn Thái Ngọc Duy <[email protected]>
---
builtin/config.c | 41 +++++++++++++++++++++--------------------
1 file changed, 21 insertions(+), 20 deletions(-)
diff --git a/builtin/config.c b/builtin/config.c
index adc7727..7dad412 100644
--- a/builtin/config.c
+++ b/builtin/config.c
@@ -87,7 +87,7 @@ static struct option builtin_config_options[] = {
static void check_argc(int argc, int min, int max) {
if (argc >= min && argc <= max)
return;
- error("wrong number of arguments");
+ error(_("wrong number of arguments"));
usage_with_options(builtin_config_usage, builtin_config_options);
}
@@ -188,7 +188,7 @@ static int get_value(const char *key_, const char *regex_)
key_regexp = (regex_t*)xmalloc(sizeof(regex_t));
if (regcomp(key_regexp, key, REG_EXTENDED)) {
- error("invalid key pattern: %s", key_);
+ error(_("invalid key pattern: %s"), key_);
free(key_regexp);
key_regexp = NULL;
ret = CONFIG_INVALID_PATTERN;
@@ -209,7 +209,7 @@ static int get_value(const char *key_, const char *regex_)
regexp = (regex_t*)xmalloc(sizeof(regex_t));
if (regcomp(regexp, regex_, REG_EXTENDED)) {
- error("invalid pattern: %s", regex_);
+ error(_("invalid pattern: %s"), regex_);
free(regexp);
regexp = NULL;
ret = CONFIG_INVALID_PATTERN;
@@ -353,10 +353,10 @@ static int get_colorbool(const char *var, int print)
static void check_write(void)
{
if (given_config_source.use_stdin)
- die("writing to stdin is not supported");
+ die(_("writing to stdin is not supported"));
if (given_config_source.blob)
- die("writing config blobs is not supported");
+ die(_("writing config blobs is not supported"));
}
struct urlmatch_current_candidate_value {
@@ -461,7 +461,7 @@ int cmd_config(int argc, const char **argv, const char
*prefix)
if (use_global_config + use_system_config + use_local_config +
!!given_config_source.file + !!given_config_source.blob > 1) {
- error("only one config file at a time.");
+ error(_("only one config file at a time."));
usage_with_options(builtin_config_usage,
builtin_config_options);
}
@@ -482,7 +482,7 @@ int cmd_config(int argc, const char **argv, const char
*prefix)
* location; error out even if XDG_CONFIG_HOME
* is set and points at a sane location.
*/
- die("$HOME not set");
+ die(_("$HOME not set"));
if (access_or_warn(user_config, R_OK, 0) &&
xdg_config && !access_or_warn(xdg_config, R_OK, 0))
@@ -512,17 +512,17 @@ int cmd_config(int argc, const char **argv, const char
*prefix)
}
if (HAS_MULTI_BITS(types)) {
- error("only one type at a time.");
+ error(_("only one type at a time."));
usage_with_options(builtin_config_usage,
builtin_config_options);
}
if ((actions & (ACTION_GET_COLOR|ACTION_GET_COLORBOOL)) && types) {
- error("--get-color and variable type are incoherent");
+ error(_("--get-color and variable type are incoherent"));
usage_with_options(builtin_config_usage,
builtin_config_options);
}
if (HAS_MULTI_BITS(actions)) {
- error("only one action at a time.");
+ error(_("only one action at a time."));
usage_with_options(builtin_config_usage,
builtin_config_options);
}
if (actions == 0)
@@ -535,7 +535,7 @@ int cmd_config(int argc, const char **argv, const char
*prefix)
}
if (omit_values &&
!(actions == ACTION_LIST || actions == ACTION_GET_REGEXP)) {
- error("--name-only is only applicable to --list or
--get-regexp");
+ error(_("--name-only is only applicable to --list or
--get-regexp"));
usage_with_options(builtin_config_usage,
builtin_config_options);
}
if (actions == ACTION_LIST) {
@@ -544,10 +544,10 @@ int cmd_config(int argc, const char **argv, const char
*prefix)
&given_config_source,
respect_includes) < 0) {
if (given_config_source.file)
- die_errno("unable to read config file '%s'",
+ die_errno(_("unable to read config file '%s'"),
given_config_source.file);
else
- die("error processing config file(s)");
+ die(_("error processing config file(s)"));
}
}
else if (actions == ACTION_EDIT) {
@@ -555,11 +555,11 @@ int cmd_config(int argc, const char **argv, const char
*prefix)
check_argc(argc, 0, 0);
if (!given_config_source.file && nongit)
- die("not in a git directory");
+ die(_("not in a git directory"));
if (given_config_source.use_stdin)
- die("editing stdin is not supported");
+ die(_("editing stdin is not supported"));
if (given_config_source.blob)
- die("editing blobs is not supported");
+ die(_("editing blobs is not supported"));
git_config(git_default_config, NULL);
config_file = xstrdup(given_config_source.file ?
given_config_source.file :
git_path("config"));
@@ -584,8 +584,9 @@ int cmd_config(int argc, const char **argv, const char
*prefix)
value = normalize_value(argv[0], argv[1]);
ret = git_config_set_in_file(given_config_source.file, argv[0],
value);
if (ret == CONFIG_NOTHING_SET)
- error("cannot overwrite multiple values with a single
value\n"
- " Use a regexp, --add or --replace-all to change
%s.", argv[0]);
+ error(_("cannot overwrite multiple values with a single
value\n"
+ "Use a regexp, --add or --replace-all to change
%s."),
+ argv[0]);
return ret;
}
else if (actions == ACTION_SET_ALL) {
@@ -655,7 +656,7 @@ int cmd_config(int argc, const char **argv, const char
*prefix)
if (ret < 0)
return ret;
if (ret == 0)
- die("No such section!");
+ die(_("No such section!"));
}
else if (actions == ACTION_REMOVE_SECTION) {
int ret;
@@ -666,7 +667,7 @@ int cmd_config(int argc, const char **argv, const char
*prefix)
if (ret < 0)
return ret;
if (ret == 0)
- die("No such section!");
+ die(_("No such section!"));
}
else if (actions == ACTION_GET_COLOR) {
check_argc(argc, 1, 2);
--
2.7.2.531.gc9e018c
-- 8< --
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
