* [PATCH] fixed translation errors
@ 2015-05-03 22:19 Alangi Derick
2015-05-04 17:39 ` Stefan Beller
2015-05-04 23:38 ` Eric Sunshine
0 siblings, 2 replies; 3+ messages in thread
From: Alangi Derick @ 2015-05-03 22:19 UTC (permalink / raw)
Signed-off-by: Alangi Derick <alangiderick@gmail.com>
---
builtin/apply.c | 60 ++++++++++++++++++++++++++++-----------------------------
1 file changed, 30 insertions(+), 30 deletions(-)
diff --git a/builtin/apply.c b/builtin/apply.c
index 0769b09..66d2aba 100644
--- a/builtin/apply.c
+++ b/builtin/apply.c
@@ -1381,7 +1381,7 @@ static void recount_diff(const char *line, int size, struct fragment *fragment)
int oldlines = 0, newlines = 0, ret = 0;
if (size < 1) {
- warning("recount: ignore empty hunk");
+ warning(_("recount: ignore empty hunk"));
return;
}
@@ -1500,8 +1500,8 @@ static int find_header(const char *line, unsigned long size, int *hdrsize, struc
patch->new_name = xstrdup(patch->def_name);
}
if (!patch->is_delete && !patch->new_name)
- die("git diff header lacks filename information "
- "(line %d)", linenr);
+ die(_("git diff header lacks filename information "
+ "(line %d)"), linenr);
patch->is_toplevel_relative = 1;
*hdrsize = git_hdr_len;
return offset;
@@ -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));
/* Fix the length of the whole thing */
@@ -2940,8 +2940,8 @@ static int apply_binary_fragment(struct image *img, struct patch *patch)
/* Binary patch is irreversible without the optional second hunk */
if (apply_in_reverse) {
if (!fragment->next)
- return error("cannot reverse-apply a binary patch "
- "without the reverse hunk to '%s'",
+ return error(_("cannot reverse-apply a binary patch "
+ "without the reverse hunk to '%s'"),
patch->new_name
? patch->new_name : patch->old_name);
fragment = fragment->next;
@@ -2984,8 +2984,8 @@ static int apply_binary(struct image *img, struct patch *patch)
strlen(patch->new_sha1_prefix) != 40 ||
get_sha1_hex(patch->old_sha1_prefix, sha1) ||
get_sha1_hex(patch->new_sha1_prefix, sha1))
- return error("cannot apply binary patch to '%s' "
- "without full index line", name);
+ return error(_("cannot apply binary patch to '%s' "
+ "without full index line"), name);
if (patch->old_name) {
/*
@@ -2994,16 +2994,16 @@ static int apply_binary(struct image *img, struct patch *patch)
*/
hash_sha1_file(img->buf, img->len, blob_type, sha1);
if (strcmp(sha1_to_hex(sha1), patch->old_sha1_prefix))
- return error("the patch applies to '%s' (%s), "
+ return error(_("the patch applies to '%s' (%s), "
"which does not match the "
- "current contents.",
+ "current contents."),
name, sha1_to_hex(sha1));
}
else {
/* Otherwise, the old one must be empty. */
if (img->len)
- return error("the patch applies to an empty "
- "'%s' but it is not empty", name);
+ return error(_("the patch applies to an empty "
+ "'%s' but it is not empty"), name);
}
get_sha1_hex(patch->new_sha1_prefix, sha1);
@@ -3020,8 +3020,8 @@ static int apply_binary(struct image *img, struct patch *patch)
result = read_sha1_file(sha1, &type, &size);
if (!result)
- return error("the necessary postimage %s for "
- "'%s' cannot be read",
+ return error(_("the necessary postimage %s for "
+ "'%s' cannot be read"),
patch->new_sha1_prefix, name);
clear_image(img);
img->buf = result;
@@ -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);
pos = cache_name_pos(name, strlen(name));
if (pos < 0)
@@ -3387,7 +3387,7 @@ static int try_threeway(struct image *image, struct patch *patch,
write_sha1_file("", 0, blob_type, pre_sha1);
else if (get_sha1(patch->old_sha1_prefix, pre_sha1) ||
read_blob_object(&buf, pre_sha1, patch->old_mode))
- return error("repository lacks the necessary blob to fall back on 3-way merge.");
+ return error(_("repository lacks the necessary blob to fall back on 3-way merge."));
fprintf(stderr, "Falling back to three-way merge...\n");
@@ -3405,11 +3405,11 @@ static int try_threeway(struct image *image, struct patch *patch,
/* our_sha1[] is ours */
if (patch->is_new) {
if (load_current(&tmp_image, patch))
- return error("cannot read the current contents of '%s'",
+ return error(_("cannot read the current contents of '%s'"),
patch->new_name);
} else {
if (load_preimage(&tmp_image, patch, st, ce))
- return error("cannot read the current contents of '%s'",
+ return error(_("cannot read the current contents of '%s'"),
patch->old_name);
}
write_sha1_file(tmp_image.buf, tmp_image.len, blob_type, our_sha1);
@@ -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));
}
return 0;
}
@@ -3888,29 +3888,29 @@ static void build_fake_ancestor(struct patch *list, const char *filename)
if (!preimage_sha1_in_gitlink_patch(patch, sha1))
; /* ok, the textual part looks sane */
else
- die("sha1 information is lacking or useless for submodule %s",
+ die(_("sha1 information is lacking or useless for submodule %s"),
name);
} else if (!get_sha1_blob(patch->old_sha1_prefix, sha1)) {
; /* ok */
} else if (!patch->lines_added && !patch->lines_deleted) {
/* mode-only change: update the current */
if (get_current_sha1(patch->old_name, sha1))
- die("mode change for %s, which is not "
- "in current HEAD", name);
+ die(_("mode change for %s, which is not "
+ "in current HEAD"), name);
} else
- die("sha1 information is lacking or useless "
- "(%s).", name);
+ die(_("sha1 information is lacking or useless "
+ "(%s)."), name);
ce = make_cache_entry(patch->old_mode, sha1, name, 0, 0);
if (!ce)
die(_("make_cache_entry failed for path '%s'"), name);
if (add_index_entry(&result, ce, ADD_CACHE_OK_TO_ADD))
- die ("Could not add %s to temporary index", name);
+ die(_("Could not add %s to temporary index"), name);
}
hold_lock_file_for_update(&lock, filename, LOCK_DIE_ON_ERROR);
if (write_locked_index(&result, &lock, COMMIT_LOCK))
- die ("Could not write temporary index to %s", filename);
+ die(_("Could not write temporary index to %s"), filename);
discard_index(&result);
}
@@ -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."));
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");
else if (whitespace_error)
--
2.4.0.2.g3386abe.dirty
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] fixed translation errors
2015-05-03 22:19 [PATCH] fixed translation errors Alangi Derick
@ 2015-05-04 17:39 ` Stefan Beller
2015-05-04 23:38 ` Eric Sunshine
1 sibling, 0 replies; 3+ messages in thread
From: Stefan Beller @ 2015-05-04 17:39 UTC (permalink / raw)
To: Alangi Derick, git@vger.kernel.org
On Sun, May 3, 2015 at 3:19 PM, Alangi Derick <alangiderick@gmail.com> wrote:
> Signed-off-by: Alangi Derick <alangiderick@gmail.com>
> ---
> builtin/apply.c | 60 ++++++++++++++++++++++++++++-----------------------------
> 1 file changed, 30 insertions(+), 30 deletions(-)
>
> diff --git a/builtin/apply.c b/builtin/apply.c
> index 0769b09..66d2aba 100644
> --- a/builtin/apply.c
> +++ b/builtin/apply.c
Please have a look at command-list.txt
or the entry man page of git [1], which makes
a difference between plumbing commands and
porcelain commands.
The plumbing layer is intended for use in scripts.
And looking for error messages in scripts is quite un easy
if these are actually translated.
The porcelain layer, which is intended to be used by people,
should have all the translations, because humans do like to
see the error message in their configured language.
[1] https://www.kernel.org/pub/software/scm/git/docs/
> @@ -1381,7 +1381,7 @@ static void recount_diff(const char *line, int size, struct fragment *fragment)
> int oldlines = 0, newlines = 0, ret = 0;
>
> if (size < 1) {
> - warning("recount: ignore empty hunk");
> + warning(_("recount: ignore empty hunk"));
> return;
> }
>
> @@ -1500,8 +1500,8 @@ static int find_header(const char *line, unsigned long size, int *hdrsize, struc
> patch->new_name = xstrdup(patch->def_name);
> }
> if (!patch->is_delete && !patch->new_name)
> - die("git diff header lacks filename information "
> - "(line %d)", linenr);
> + die(_("git diff header lacks filename information "
> + "(line %d)"), linenr);
> patch->is_toplevel_relative = 1;
> *hdrsize = git_hdr_len;
> return offset;
> @@ -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));
>
> /* Fix the length of the whole thing */
> @@ -2940,8 +2940,8 @@ static int apply_binary_fragment(struct image *img, struct patch *patch)
> /* Binary patch is irreversible without the optional second hunk */
> if (apply_in_reverse) {
> if (!fragment->next)
> - return error("cannot reverse-apply a binary patch "
> - "without the reverse hunk to '%s'",
> + return error(_("cannot reverse-apply a binary patch "
> + "without the reverse hunk to '%s'"),
> patch->new_name
> ? patch->new_name : patch->old_name);
> fragment = fragment->next;
> @@ -2984,8 +2984,8 @@ static int apply_binary(struct image *img, struct patch *patch)
> strlen(patch->new_sha1_prefix) != 40 ||
> get_sha1_hex(patch->old_sha1_prefix, sha1) ||
> get_sha1_hex(patch->new_sha1_prefix, sha1))
> - return error("cannot apply binary patch to '%s' "
> - "without full index line", name);
> + return error(_("cannot apply binary patch to '%s' "
> + "without full index line"), name);
>
> if (patch->old_name) {
> /*
> @@ -2994,16 +2994,16 @@ static int apply_binary(struct image *img, struct patch *patch)
> */
> hash_sha1_file(img->buf, img->len, blob_type, sha1);
> if (strcmp(sha1_to_hex(sha1), patch->old_sha1_prefix))
> - return error("the patch applies to '%s' (%s), "
> + return error(_("the patch applies to '%s' (%s), "
> "which does not match the "
> - "current contents.",
> + "current contents."),
> name, sha1_to_hex(sha1));
> }
> else {
> /* Otherwise, the old one must be empty. */
> if (img->len)
> - return error("the patch applies to an empty "
> - "'%s' but it is not empty", name);
> + return error(_("the patch applies to an empty "
> + "'%s' but it is not empty"), name);
> }
>
> get_sha1_hex(patch->new_sha1_prefix, sha1);
> @@ -3020,8 +3020,8 @@ static int apply_binary(struct image *img, struct patch *patch)
>
> result = read_sha1_file(sha1, &type, &size);
> if (!result)
> - return error("the necessary postimage %s for "
> - "'%s' cannot be read",
> + return error(_("the necessary postimage %s for "
> + "'%s' cannot be read"),
> patch->new_sha1_prefix, name);
> clear_image(img);
> img->buf = result;
> @@ -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);
>
> pos = cache_name_pos(name, strlen(name));
> if (pos < 0)
> @@ -3387,7 +3387,7 @@ static int try_threeway(struct image *image, struct patch *patch,
> write_sha1_file("", 0, blob_type, pre_sha1);
> else if (get_sha1(patch->old_sha1_prefix, pre_sha1) ||
> read_blob_object(&buf, pre_sha1, patch->old_mode))
> - return error("repository lacks the necessary blob to fall back on 3-way merge.");
> + return error(_("repository lacks the necessary blob to fall back on 3-way merge."));
>
> fprintf(stderr, "Falling back to three-way merge...\n");
>
> @@ -3405,11 +3405,11 @@ static int try_threeway(struct image *image, struct patch *patch,
> /* our_sha1[] is ours */
> if (patch->is_new) {
> if (load_current(&tmp_image, patch))
> - return error("cannot read the current contents of '%s'",
> + return error(_("cannot read the current contents of '%s'"),
> patch->new_name);
> } else {
> if (load_preimage(&tmp_image, patch, st, ce))
> - return error("cannot read the current contents of '%s'",
> + return error(_("cannot read the current contents of '%s'"),
> patch->old_name);
> }
> write_sha1_file(tmp_image.buf, tmp_image.len, blob_type, our_sha1);
> @@ -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));
> }
> return 0;
> }
> @@ -3888,29 +3888,29 @@ static void build_fake_ancestor(struct patch *list, const char *filename)
> if (!preimage_sha1_in_gitlink_patch(patch, sha1))
> ; /* ok, the textual part looks sane */
> else
> - die("sha1 information is lacking or useless for submodule %s",
> + die(_("sha1 information is lacking or useless for submodule %s"),
> name);
> } else if (!get_sha1_blob(patch->old_sha1_prefix, sha1)) {
> ; /* ok */
> } else if (!patch->lines_added && !patch->lines_deleted) {
> /* mode-only change: update the current */
> if (get_current_sha1(patch->old_name, sha1))
> - die("mode change for %s, which is not "
> - "in current HEAD", name);
> + die(_("mode change for %s, which is not "
> + "in current HEAD"), name);
> } else
> - die("sha1 information is lacking or useless "
> - "(%s).", name);
> + die(_("sha1 information is lacking or useless "
> + "(%s)."), name);
>
> ce = make_cache_entry(patch->old_mode, sha1, name, 0, 0);
> if (!ce)
> die(_("make_cache_entry failed for path '%s'"), name);
> if (add_index_entry(&result, ce, ADD_CACHE_OK_TO_ADD))
> - die ("Could not add %s to temporary index", name);
> + die(_("Could not add %s to temporary index"), name);
> }
>
> hold_lock_file_for_update(&lock, filename, LOCK_DIE_ON_ERROR);
> if (write_locked_index(&result, &lock, COMMIT_LOCK))
> - die ("Could not write temporary index to %s", filename);
> + die(_("Could not write temporary index to %s"), filename);
>
> discard_index(&result);
> }
> @@ -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."));
> 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");
> 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@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] fixed translation errors
2015-05-03 22:19 [PATCH] fixed translation errors Alangi Derick
2015-05-04 17:39 ` Stefan Beller
@ 2015-05-04 23:38 ` Eric Sunshine
1 sibling, 0 replies; 3+ messages in thread
From: Eric Sunshine @ 2015-05-04 23:38 UTC (permalink / raw)
To: Alangi Derick, Git List
On Sun, May 3, 2015 at 6:19 PM, Alangi Derick <alangiderick@gmail.com> wrote:
> Signed-off-by: Alangi Derick <alangiderick@gmail.com>
> ---
> 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
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2015-05-04 23:39 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-05-03 22:19 [PATCH] fixed translation errors Alangi Derick
2015-05-04 17:39 ` Stefan Beller
2015-05-04 23:38 ` Eric Sunshine
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).