Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
i18n: show-branch: mark error messages for translation
author
Vasco Almeida
<vascomalmeida@sapo.pt>
Thu, 15 Sep 2016 14:59:06 +0000
(14:59 +0000)
committer
Junio C Hamano
<gitster@pobox.com>
Thu, 15 Sep 2016 20:17:32 +0000
(13:17 -0700)
Spell the first word of messages in lowercase, following the usual
style.
Signed-off-by: Vasco Almeida <vascomalmeida@sapo.pt>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
builtin/show-branch.c
patch
|
blob
|
history
raw
|
patch
|
inline
| side by side (parent:
8ba35a2
)
diff --git
a/builtin/show-branch.c
b/builtin/show-branch.c
index 25669357e97e892ffb050d879b74d13a91d4fafc..58093711f6f40752895c07f8722516f110ff669c 100644
(file)
--- a/
builtin/show-branch.c
+++ b/
builtin/show-branch.c
@@
-538,7
+538,7
@@
static void append_one_rev(const char *av)
for_each_ref(append_matching_ref, NULL);
if (saved_matches == ref_name_cnt &&
ref_name_cnt < MAX_REVS)
for_each_ref(append_matching_ref, NULL);
if (saved_matches == ref_name_cnt &&
ref_name_cnt < MAX_REVS)
- error(
"no matching refs with %s"
, av);
+ error(
_("no matching refs with %s")
, av);
if (saved_matches + 1 < ref_name_cnt)
sort_ref_range(saved_matches, ref_name_cnt);
return;
if (saved_matches + 1 < ref_name_cnt)
sort_ref_range(saved_matches, ref_name_cnt);
return;
@@
-701,8
+701,8
@@
int cmd_show_branch(int ac, const char **av, const char *prefix)
*
* Also --all and --remotes do not make sense either.
*/
*
* Also --all and --remotes do not make sense either.
*/
- die("--reflog is incompatible with --all, --remotes, "
-
"--independent or --merge-base"
);
+ die(
_(
"--reflog is incompatible with --all, --remotes, "
+
"--independent or --merge-base")
);
}
/* If nothing is specified, show all branches by default */
}
/* If nothing is specified, show all branches by default */
@@
-725,16
+725,16
@@
int cmd_show_branch(int ac, const char **av, const char *prefix)
av = fake_av;
ac = 1;
if (!*av)
av = fake_av;
ac = 1;
if (!*av)
- die(
"no branches given, and HEAD is not valid"
);
+ die(
_("no branches given, and HEAD is not valid")
);
}
if (ac != 1)
}
if (ac != 1)
- die(
"--reflog option needs one branch name"
);
+ die(
_("--reflog option needs one branch name")
);
if (MAX_REVS < reflog)
die("Only %d entries can be shown at one time.",
MAX_REVS);
if (!dwim_ref(*av, strlen(*av), oid.hash, &ref))
if (MAX_REVS < reflog)
die("Only %d entries can be shown at one time.",
MAX_REVS);
if (!dwim_ref(*av, strlen(*av), oid.hash, &ref))
- die(
"No such ref %s"
, *av);
+ die(
_("no such ref %s")
, *av);
/* Has the base been specified? */
if (reflog_base) {
/* Has the base been specified? */
if (reflog_base) {
@@
-828,10
+828,10
@@
int cmd_show_branch(int ac, const char **av, const char *prefix)
if (MAX_REVS <= num_rev)
die("cannot handle more than %d revs.", MAX_REVS);
if (get_sha1(ref_name[num_rev], revkey.hash))
if (MAX_REVS <= num_rev)
die("cannot handle more than %d revs.", MAX_REVS);
if (get_sha1(ref_name[num_rev], revkey.hash))
- die(
"'%s' is not a valid ref."
, ref_name[num_rev]);
+ die(
_("'%s' is not a valid ref.")
, ref_name[num_rev]);
commit = lookup_commit_reference(revkey.hash);
if (!commit)
commit = lookup_commit_reference(revkey.hash);
if (!commit)
- die(
"cannot find commit %s (%s)"
,
+ die(
_("cannot find commit %s (%s)")
,
ref_name[num_rev], oid_to_hex(&revkey));
parse_commit(commit);
mark_seen(commit, &seen);
ref_name[num_rev], oid_to_hex(&revkey));
parse_commit(commit);
mark_seen(commit, &seen);