Skip to content

Commit

Permalink
Mark messages for translations
Browse files Browse the repository at this point in the history 
Small changes in messages to fit the style and typography of rest.
Reuse already translated messages if possible.
Do not translate messages aimed at developers of git.
Fix unit tests depending on the original string.
Use `test_i18ngrep` for tests with translatable strings.
Change and verify rest of tests via `make GETTEXT_POISON=1 test`.

Signed-off-by: Alexander Shopov <ash@kambanaria.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
  • Loading branch information
@alshopov @gitster
alshopov authored and gitster committed Feb 13, 2018
1 parent 5be1f00 commit fc045fe
Show file tree
Hide file tree
Showing 5 changed files with 54 additions and 54 deletions.
38 changes: 19 additions & 19 deletions git.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@
#include "run-command.h"

const char git_usage_string[] =
"git [--version] [--help] [-C <path>] [-c name=value]\n"
" [--exec-path[=<path>]] [--html-path] [--man-path] [--info-path]\n"
" [-p | --paginate | --no-pager] [--no-replace-objects] [--bare]\n"
" [--git-dir=<path>] [--work-tree=<path>] [--namespace=<name>]\n"
" <command> [<args>]";
N_("git [--version] [--help] [-C <path>] [-c <name>=<value>]\n"
" [--exec-path[=<path>]] [--html-path] [--man-path] [--info-path]\n"
" [-p | --paginate | --no-pager] [--no-replace-objects] [--bare]\n"
" [--git-dir=<path>] [--work-tree=<path>] [--namespace=<name>]\n"
" <command> [<args>]");

const char git_more_info_string[] =
N_("'git help -a' and 'git help -g' list available subcommands and some\n"
Expand Down Expand Up @@ -92,7 +92,7 @@ static int handle_options(const char ***argv, int *argc, int *envchanged)
*envchanged = 1;
} else if (!strcmp(cmd, "--git-dir")) {
if (*argc < 2) {
fprintf(stderr, "No directory given for --git-dir.\n" );
fprintf(stderr, _("no directory given for --git-dir\n" ));
usage(git_usage_string);
}
setenv(GIT_DIR_ENVIRONMENT, (*argv)[1], 1);
Expand All @@ -106,7 +106,7 @@ static int handle_options(const char ***argv, int *argc, int *envchanged)
*envchanged = 1;
} else if (!strcmp(cmd, "--namespace")) {
if (*argc < 2) {
fprintf(stderr, "No namespace given for --namespace.\n" );
fprintf(stderr, _("no namespace given for --namespace\n" ));
usage(git_usage_string);
}
setenv(GIT_NAMESPACE_ENVIRONMENT, (*argv)[1], 1);
Expand All @@ -120,7 +120,7 @@ static int handle_options(const char ***argv, int *argc, int *envchanged)
*envchanged = 1;
} else if (!strcmp(cmd, "--work-tree")) {
if (*argc < 2) {
fprintf(stderr, "No directory given for --work-tree.\n" );
fprintf(stderr, _("no directory given for --work-tree\n" ));
usage(git_usage_string);
}
setenv(GIT_WORK_TREE_ENVIRONMENT, (*argv)[1], 1);
Expand All @@ -134,7 +134,7 @@ static int handle_options(const char ***argv, int *argc, int *envchanged)
*envchanged = 1;
} else if (!strcmp(cmd, "--super-prefix")) {
if (*argc < 2) {
fprintf(stderr, "No prefix given for --super-prefix.\n" );
fprintf(stderr, _("no prefix given for --super-prefix\n" ));
usage(git_usage_string);
}
setenv(GIT_SUPER_PREFIX_ENVIRONMENT, (*argv)[1], 1);
Expand All @@ -156,7 +156,7 @@ static int handle_options(const char ***argv, int *argc, int *envchanged)
*envchanged = 1;
} else if (!strcmp(cmd, "-c")) {
if (*argc < 2) {
fprintf(stderr, "-c expects a configuration string\n" );
fprintf(stderr, _("-c expects a configuration string\n" ));
usage(git_usage_string);
}
git_config_push_parameter((*argv)[1]);
Expand Down Expand Up @@ -194,12 +194,12 @@ static int handle_options(const char ***argv, int *argc, int *envchanged)
*envchanged = 1;
} else if (!strcmp(cmd, "-C")) {
if (*argc < 2) {
fprintf(stderr, "No directory given for -C.\n" );
fprintf(stderr, _("no directory given for -C\n" ));
usage(git_usage_string);
}
if ((*argv)[1][0]) {
if (chdir((*argv)[1]))
die_errno("Cannot change to '%s'", (*argv)[1]);
die_errno("cannot change to '%s'", (*argv)[1]);
if (envchanged)
*envchanged = 1;
}
Expand All @@ -209,7 +209,7 @@ static int handle_options(const char ***argv, int *argc, int *envchanged)
list_builtins();
exit(0);
} else {
fprintf(stderr, "Unknown option: %s\n", cmd);
fprintf(stderr, _("unknown option: %s\n"), cmd);
usage(git_usage_string);
}

Expand Down Expand Up @@ -247,7 +247,7 @@ static int handle_alias(int *argcp, const char ***argv)
if (ret >= 0) /* normal exit */
exit(ret);

die_errno("While expanding alias '%s': '%s'",
die_errno("while expanding alias '%s': '%s'",
alias_command, alias_string + 1);
}
count = split_cmdline(alias_string, &new_argv);
Expand All @@ -256,8 +256,8 @@ static int handle_alias(int *argcp, const char ***argv)
split_cmdline_strerror(count));
option_count = handle_options(&new_argv, &count, &envchanged);
if (envchanged)
die("alias '%s' changes environment variables\n"
"You can use '!git' in the alias to do this.",
die("alias '%s' changes environment variables.\n"
"You can use '!git' in the alias to do this",
alias_command);
memmove(new_argv - option_count, new_argv,
count * sizeof(char *));
Expand Down Expand Up @@ -684,8 +684,8 @@ int cmd_main(int argc, const char **argv)
if (errno != ENOENT)
break;
if (was_alias) {
fprintf(stderr, "Expansion of alias '%s' failed; "
"'%s' is not a git command\n",
fprintf(stderr, _("expansion of alias '%s' failed; "
"'%s' is not a git command\n"),
cmd, argv[0]);
exit(1);
}
Expand All @@ -696,7 +696,7 @@ int cmd_main(int argc, const char **argv)
break;
}

fprintf(stderr, "Failed to run command '%s': %s\n",
fprintf(stderr, _("failed to run command '%s': %s\n"),
cmd, strerror(errno));

return 1;
Expand Down
62 changes: 31 additions & 31 deletions setup.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ char *prefix_path(const char *prefix, int len, const char *path)
{
char *r = prefix_path_gently(prefix, len, NULL, path);
if (!r)
die("'%s' is outside repository", path);
die(_("'%s' is outside repository"), path);
return r;
}

Expand Down Expand Up @@ -160,7 +160,7 @@ int check_filename(const char *prefix, const char *arg)
free(to_free);
return 0; /* file does not exist */
}
die_errno("failed to stat '%s'", arg);
die_errno(_("failed to stat '%s'"), arg);
}

static void NORETURN die_verify_filename(const char *prefix,
Expand Down Expand Up @@ -230,7 +230,7 @@ void verify_filename(const char *prefix,
int diagnose_misspelt_rev)
{
if (*arg == '-')
die("option '%s' must come before non-option arguments", arg);
die(_("option '%s' must come before non-option arguments"), arg);
if (looks_like_pathspec(arg) || check_filename(prefix, arg))
return;
die_verify_filename(prefix, arg, diagnose_misspelt_rev);
Expand Down Expand Up @@ -385,14 +385,14 @@ void setup_work_tree(void)
return;

if (work_tree_config_is_bogus)
die("unable to set up work tree using invalid config");
die(_("unable to set up work tree using invalid config"));

work_tree = get_git_work_tree();
git_dir = get_git_dir();
if (!is_absolute_path(git_dir))
git_dir = real_path(get_git_dir());
if (!work_tree || chdir(work_tree))
die("This operation must be run in a work tree");
die(_("this operation must be run in a work tree"));

/*
* Make sure subsequent git processes find correct worktree
Expand Down Expand Up @@ -525,17 +525,17 @@ void read_gitfile_error_die(int error_code, const char *path, const char *dir)
/* non-fatal; follow return path */
break;
case READ_GITFILE_ERR_OPEN_FAILED:
die_errno("Error opening '%s'", path);
die_errno(_("error opening '%s'"), path);
case READ_GITFILE_ERR_TOO_LARGE:
die("Too large to be a .git file: '%s'", path);
die(_("too large to be a .git file: '%s'"), path);
case READ_GITFILE_ERR_READ_FAILED:
die("Error reading %s", path);
die(_("error reading %s"), path);
case READ_GITFILE_ERR_INVALID_FORMAT:
die("Invalid gitfile format: %s", path);
die(_("invalid gitfile format: %s"), path);
case READ_GITFILE_ERR_NO_PATH:
die("No path in gitfile: %s", path);
die(_("no path in gitfile: %s"), path);
case READ_GITFILE_ERR_NOT_A_REPO:
die("Not a git repository: %s", dir);
die(_("not a git repository: %s"), dir);
default:
die("BUG: unknown error code");
}
Expand Down Expand Up @@ -634,7 +634,7 @@ static const char *setup_explicit_git_dir(const char *gitdirenv,
int offset;

if (PATH_MAX - 40 < strlen(gitdirenv))
die("'$%s' too big", GIT_DIR_ENVIRONMENT);
die(_("'$%s' too big"), GIT_DIR_ENVIRONMENT);

gitfile = (char*)read_gitfile(gitdirenv);
if (gitfile) {
Expand All @@ -648,7 +648,7 @@ static const char *setup_explicit_git_dir(const char *gitdirenv,
free(gitfile);
return NULL;
}
die("Not a git repository: '%s'", gitdirenv);
die(_("not a git repository: '%s'"), gitdirenv);
}

if (check_repository_format_gently(gitdirenv, repo_fmt, nongit_ok)) {
Expand Down Expand Up @@ -677,12 +677,12 @@ static const char *setup_explicit_git_dir(const char *gitdirenv,
else {
char *core_worktree;
if (chdir(gitdirenv))
die_errno("Could not chdir to '%s'", gitdirenv);
die_errno(_("cannot chdir to '%s'"), gitdirenv);
if (chdir(git_work_tree_cfg))
die_errno("Could not chdir to '%s'", git_work_tree_cfg);
die_errno(_("cannot chdir to '%s'"), git_work_tree_cfg);
core_worktree = xgetcwd();
if (chdir(cwd->buf))
die_errno("Could not come back to cwd");
die_errno(_("cannot come back to cwd"));
set_git_work_tree(core_worktree);
free(core_worktree);
}
Expand Down Expand Up @@ -710,7 +710,7 @@ static const char *setup_explicit_git_dir(const char *gitdirenv,
if (offset >= 0) { /* cwd inside worktree? */
set_git_dir(real_path(gitdirenv));
if (chdir(worktree))
die_errno("Could not chdir to '%s'", worktree);
die_errno(_("cannot chdir to '%s'"), worktree);
strbuf_addch(cwd, '/');
free(gitfile);
return cwd->buf + offset;
Expand Down Expand Up @@ -738,7 +738,7 @@ static const char *setup_discovered_git_dir(const char *gitdir,
if (offset != cwd->len && !is_absolute_path(gitdir))
gitdir = to_free = real_pathdup(gitdir, 1);
if (chdir(cwd->buf))
die_errno("Could not come back to cwd");
die_errno(_("cannot come back to cwd"));
ret = setup_explicit_git_dir(gitdir, cwd, repo_fmt, nongit_ok);
free(to_free);
return ret;
Expand All @@ -748,7 +748,7 @@ static const char *setup_discovered_git_dir(const char *gitdir,
if (is_bare_repository_cfg > 0) {
set_git_dir(offset == cwd->len ? gitdir : real_path(gitdir));
if (chdir(cwd->buf))
die_errno("Could not come back to cwd");
die_errno(_("cannot come back to cwd"));
return NULL;
}

Expand Down Expand Up @@ -787,15 +787,15 @@ static const char *setup_bare_git_dir(struct strbuf *cwd, int offset,

gitdir = offset == cwd->len ? "." : xmemdupz(cwd->buf, offset);
if (chdir(cwd->buf))
die_errno("Could not come back to cwd");
die_errno(_("cannot come back to cwd"));
return setup_explicit_git_dir(gitdir, cwd, repo_fmt, nongit_ok);
}

inside_git_dir = 1;
inside_work_tree = 0;
if (offset != cwd->len) {
if (chdir(cwd->buf))
die_errno("Cannot come back to cwd");
die_errno(_("cannot come back to cwd"));
root_len = offset_1st_component(cwd->buf);
strbuf_setlen(cwd, offset > root_len ? offset : root_len);
set_git_dir(cwd->buf);
Expand All @@ -808,9 +808,9 @@ static const char *setup_bare_git_dir(struct strbuf *cwd, int offset,
static const char *setup_nongit(const char *cwd, int *nongit_ok)
{
if (!nongit_ok)
die(_("Not a git repository (or any of the parent directories): %s"), DEFAULT_GIT_DIR_ENVIRONMENT);
die(_("not a git repository (or any of the parent directories): %s"), DEFAULT_GIT_DIR_ENVIRONMENT);
if (chdir(cwd))
die_errno(_("Cannot come back to cwd"));
die_errno(_("cannot come back to cwd"));
*nongit_ok = 1;
return NULL;
}
Expand All @@ -819,7 +819,7 @@ static dev_t get_device_or_die(const char *path, const char *prefix, int prefix_
{
struct stat buf;
if (stat(path, &buf)) {
die_errno("failed to stat '%*s%s%s'",
die_errno(_("failed to stat '%*s%s%s'"),
prefix_len,
prefix ? prefix : "",
prefix ? "/" : "", path);
Expand Down Expand Up @@ -1061,13 +1061,13 @@ const char *setup_git_directory_gently(int *nongit_ok)
break;
case GIT_DIR_DISCOVERED:
if (dir.len < cwd.len && chdir(dir.buf))
die(_("Cannot change to '%s'"), dir.buf);
die(_("cannot change to '%s'"), dir.buf);
prefix = setup_discovered_git_dir(gitdir.buf, &cwd, dir.len,
&repo_fmt, nongit_ok);
break;
case GIT_DIR_BARE:
if (dir.len < cwd.len && chdir(dir.buf))
die(_("Cannot change to '%s'"), dir.buf);
die(_("cannot change to '%s'"), dir.buf);
prefix = setup_bare_git_dir(&cwd, dir.len, &repo_fmt, nongit_ok);
break;
case GIT_DIR_HIT_CEILING:
Expand All @@ -1080,7 +1080,7 @@ const char *setup_git_directory_gently(int *nongit_ok)
strbuf_release(&dir);
return NULL;
}
die(_("Not a git repository (or any parent up to mount point %s)\n"
die(_("not a git repository (or any parent up to mount point %s)\n"
"Stopping at filesystem boundary (GIT_DISCOVERY_ACROSS_FILESYSTEM not set)."),
dir.buf);
default:
Expand Down Expand Up @@ -1164,7 +1164,7 @@ int git_config_perm(const char *var, const char *value)
/* A filemode value was given: 0xxx */

if ((i & 0600) != 0600)
die(_("Problem with core.sharedRepository filemode value "
die(_("problem with core.sharedRepository filemode value "
"(0%.3o).\nThe owner of files must always have "
"read and write permissions."), i);

Expand Down Expand Up @@ -1207,7 +1207,7 @@ void sanitize_stdfds(void)
while (fd != -1 && fd < 2)
fd = dup(fd);
if (fd == -1)
die_errno("open /dev/null or dup failed");
die_errno(_("open /dev/null or dup failed"));
if (fd > 2)
close(fd);
}
Expand All @@ -1222,12 +1222,12 @@ int daemonize(void)
case 0:
break;
case -1:
die_errno("fork failed");
die_errno(_("fork failed"));
default:
exit(0);
}
if (setsid() == -1)
die_errno("setsid failed");
die_errno(_("setsid failed"));
close(0);
close(1);
close(2);
Expand Down
4 changes: 2 additions & 2 deletions t/t0002-gitfile.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ test_expect_success 'bad setup: invalid .git file format' '
echo "git rev-parse accepted an invalid .git file"
false
fi &&
if ! grep "Invalid gitfile format" .err
if ! test_i18ngrep "invalid gitfile format" .err
then
echo "git rev-parse returned wrong error"
false
Expand All @@ -45,7 +45,7 @@ test_expect_success 'bad setup: invalid .git file path' '
echo "git rev-parse accepted an invalid .git file path"
false
fi &&
if ! grep "Not a git repository" .err
if ! test_i18ngrep "not a git repository" .err
then
echo "git rev-parse returned wrong error"
false
Expand Down
2 changes: 1 addition & 1 deletion t/t0008-ignores.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -307,7 +307,7 @@ test_expect_success_multi 'needs work tree' '' '
cd .git &&
test_check_ignore "foo" 128
) &&
stderr_contains "fatal: This operation must be run in a work tree"
stderr_contains "fatal: this operation must be run in a work tree"
'

############################################################################
Expand Down
2 changes: 1 addition & 1 deletion t/t1506-rev-parse-diagnosis.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,7 @@ test_expect_success 'relative path not found' '
test_expect_success 'relative path outside worktree' '
test_must_fail git rev-parse HEAD:../file.txt >output 2>error &&
test -z "$(cat output)" &&
grep "outside repository" error
test_i18ngrep "outside repository" error
'

test_expect_success 'relative path when cwd is outside worktree' '
Expand Down

0 comments on commit fc045fe

Please sign in to comment.