On Sun, May 3, 2015 at 6:19 PM, Alangi Derick <alangiderick@xxxxxxxxx> wrote:
> Signed-off-by: Alangi Derick <alangiderick@xxxxxxxxx>
> ---
> diff --git a/builtin/apply.c b/builtin/apply.c
> index 0769b09..66d2aba 100644
> --- a/builtin/apply.c
> +++ b/builtin/apply.c
> @@ -2237,7 +2237,7 @@ static void update_pre_post_images(struct image *preimage,
> if (postlen
> ? postlen < new - postimage->buf
> : postimage->len < new - postimage->buf)
> - die("BUG: caller miscounted postlen: asked %d, orig = %d, used = %d",
> + die(_("BUG: caller miscounted postlen: asked %d, orig = %d, used = %d"),
> (int)postlen, (int) postimage->len, (int)(new - postimage->buf));
This condition represents a bug in Git itself, which should never
trigger. As such, there's probably very little value in having it
translated, and doing so would make extra work for those translating
the messages.
> /* Fix the length of the whole thing */
> @@ -3342,7 +3342,7 @@ static int load_current(struct image *image, struct patch *patch)
> unsigned mode = patch->new_mode;
>
> if (!patch->is_new)
> - die("BUG: patch to %s is not a creation", patch->old_name);
> + die(_("BUG: patch to %s is not a creation"), patch->old_name);
Ditto: Internal Git error.
> pos = cache_name_pos(name, strlen(name));
> if (pos < 0)
> @@ -3572,7 +3572,7 @@ static int check_to_create(const char *new_name, int ok_if_exists)
>
> return EXISTS_IN_WORKTREE;
> } else if ((errno != ENOENT) && (errno != ENOTDIR)) {
> - return error("%s: %s", new_name, strerror(errno));
> + return error(_("%s: %s"), new_name, strerror(errno));
There isn't a whole lot here for translators to work with; no context
or indication of what this message is about. (Perhaps the only thing a
translator can do is adjust whitespace around the colon.) This might
be the sort of case where you want to submit a separate patch which
both fleshes out this error message with enough context for
translators to sink their teeth into, and make the string
translatable.
> }
> return 0;
> }
> @@ -4599,9 +4599,9 @@ int cmd_apply(int argc, const char **argv, const char *prefix_)
> apply_usage, 0);
>
> if (apply_with_reject && threeway)
> - die("--reject and --3way cannot be used together.");
> + die(("--reject and --3way cannot be used together."));
> if (cached && threeway)
> - die("--cached and --3way cannot be used together.");
> + die(("--cached and --3way cannot be used together."));
You forgot the '_' in '_(...)' on both of these.
> if (threeway) {
> if (is_not_gitdir)
> die(_("--3way outside a repository"));
> @@ -4659,8 +4659,8 @@ int cmd_apply(int argc, const char **argv, const char *prefix_)
> whitespace_error),
> whitespace_error);
> if (applied_after_fixing_ws && apply)
> - warning("%d line%s applied after"
> - " fixing whitespace errors.",
> + warning(_("%d line%s applied after"
> + " fixing whitespace errors."),
> applied_after_fixing_ws,
> applied_after_fixing_ws == 1 ? "" : "s");
This sort of pluralization (adding "s") only works in some languages.
To translate this properly use Q_(...). See [1] for details, as well
as existing uses of Q_(...) in Git.
[1]: http://www.gnu.org/savannah-checkouts/gnu/gettext/manual/html_node/Plural-forms.html
> else if (whitespace_error)
> --
> 2.4.0.2.g3386abe.dirty
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html