Skip to content

Commit af15f84

Browse files
jnavilagitster
authored andcommitted
i18n: fix some badly formatted i18n strings
String in submodule--helper is not correctly formatting placeholders. The string in git-send-email is partial. Signed-off-by: Jean-Noël Avila <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent ab1f276 commit af15f84

File tree

2 files changed

+4
-5
lines changed

2 files changed

+4
-5
lines changed

builtin/submodule--helper.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3082,7 +3082,7 @@ static int module_create_branch(int argc, const char **argv, const char *prefix)
30823082
OPT_END()
30833083
};
30843084
const char *const usage[] = {
3085-
N_("git submodule--helper create-branch [-f|--force] [--create-reflog] [-q|--quiet] [-t|--track] [-n|--dry-run] <name> <start_oid> <start_name>"),
3085+
N_("git submodule--helper create-branch [-f|--force] [--create-reflog] [-q|--quiet] [-t|--track] [-n|--dry-run] <name> <start-oid> <start-name>"),
30863086
NULL
30873087
};
30883088

git-send-email.perl

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2096,10 +2096,9 @@ sub validate_patch {
20962096
chdir($cwd_save) or die("chdir: $!");
20972097
}
20982098
if ($hook_error) {
2099-
$hook_error = sprintf(__("fatal: %s: rejected by %s hook\n" .
2100-
$hook_error . "\n" .
2101-
"warning: no patches were sent\n"),
2102-
$fn, $hook_name);
2099+
$hook_error = sprintf(
2100+
__("fatal: %s: rejected by %s hook\n%s\nwarning: no patches were sent\n"),
2101+
$fn, $hook_name, $hook_error);
21032102
die $hook_error;
21042103
}
21052104
}

0 commit comments

Comments
 (0)