# [PATCH 2/2] i18n: bisect: mark two supplementary strings for translation 7 messages from 2018-06-21 to 2018-06-30. Participants: Raphaël Hertzog, Duy Nguyen, Raphael Hertzog. Thread: https://gitlist.dev/t/48752 ## Raphaël Hertzog, 2018-06-21 14:27 Subject: [PATCH 2/2] i18n: bisect: mark two supplementary strings for translation Message-ID: <20180621142742.28575-3-hertzog@debian.org> URL: https://gitlist.dev/e/20180621142742.28575-3-hertzog%40debian.org In-Reply-To: <20180621142742.28575-1-hertzog@debian.org> ``` The whole bisect procedure is translated but the last message that the user will see in the process is not translated. Let's fix this. Signed-off-by: Raphaël Hertzog --- bisect.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/bisect.c b/bisect.c index a579b5088..8edc7a7a6 100644 --- a/bisect.c +++ b/bisect.c @@ -658,8 +658,8 @@ static void exit_if_skipped_commits(struct commit_list *tried, if (!tried) return; - printf("There are only 'skip'ped commits left to test.\n" - "The first %s commit could be any of:\n", term_bad); + printf(_("There are only 'skip'ped commits left to test.\n" + "The first %s commit could be any of:\n"), term_bad); for ( ; tried; tried = tried->next) printf("%s\n", oid_to_hex(&tried->item->object.oid)); @@ -984,7 +984,7 @@ int bisect_next_all(const char *prefix, int no_checkout) if (!oidcmp(bisect_rev, current_bad_oid)) { exit_if_skipped_commits(tried, current_bad_oid); - printf("%s is the first %s commit\n", oid_to_hex(bisect_rev), + printf(_("%s is the first %s commit\n"), oid_to_hex(bisect_rev), term_bad); show_diff_tree(prefix, revs.commits->item); /* This means the bisection process succeeded. */ -- 2.18.0.rc2 ``` ## Raphaël Hertzog, 2018-06-21 14:27 Subject: Two small l10n/i18n patches Message-ID: <20180621142742.28575-1-hertzog@debian.org> URL: https://gitlist.dev/e/20180621142742.28575-1-hertzog%40debian.org ``` (I'm not subscribed, please keep me in CC) Hello, I was reviewing the output of "git bisect" with my French locale and I saw a clear mistake in the French translation (fixed in the first commit) and I also noticed that the last message was still in English. After review of the code, it's not a missing translation, the problem comes down to two strings which are not marked for translation. So the second commit marks those strings for translation. But I haven't checked much further than that. The final string is used in many places in the test suite and I haven't checked if the locale is properly hardcoded in the test suite. In any case, "make test" is still working after those two commits. Thank you for considering my patches. I leave it tho the regular translators to add translations for the newly added strings. ``` ## Raphaël Hertzog, 2018-06-21 14:27 Subject: [PATCH 1/2] l10n: fr: fix a message seen in git bisect Message-ID: <20180621142742.28575-2-hertzog@debian.org> URL: https://gitlist.dev/e/20180621142742.28575-2-hertzog%40debian.org In-Reply-To: <20180621142742.28575-1-hertzog@debian.org> ``` "cette" can be only be used before a word (like in "cette bouteille" for "this bottle"), but here "this" refers to the current step and we have to use "ceci" in French. Signed-off-by: Raphaël Hertzog --- po/fr.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/fr.po b/po/fr.po index 2bae75360..eb760686a 100644 --- a/po/fr.po +++ b/po/fr.po @@ -1062,8 +1062,8 @@ msgstr[1] "(à peu près %d étapes)" #, c-format msgid "Bisecting: %d revision left to test after this %s\n" msgid_plural "Bisecting: %d revisions left to test after this %s\n" -msgstr[0] "Bissection : %d révision à tester après cette %s\n" -msgstr[1] "Bissection : %d révisions à tester après cette %s\n" +msgstr[0] "Bissection : %d révision à tester après ceci %s\n" +msgstr[1] "Bissection : %d révisions à tester après ceci %s\n" #: blame.c:1756 msgid "--contents and --reverse do not blend well." -- 2.18.0.rc2 ``` ## Duy Nguyen, 2018-06-21 14:48 Subject: Re: [PATCH 2/2] i18n: bisect: mark two supplementary strings for translation Message-ID: URL: https://gitlist.dev/e/CACsJy8DcXo3HURwZXbvGYjrJpfku%2BRXESP%3DErLzYj3NhNabRTQ%40mail.gmail.com In-Reply-To: <20180621142742.28575-3-hertzog@debian.org> ``` On Thu, Jun 21, 2018 at 4:39 PM Raphaël Hertzog wrote: > > The whole bisect procedure is translated but the last message > that the user will see in the process is not translated. Let's fix this. Nice. There's another string in bisect_common() that should also be translated: "revision walk setup failed". Maybe you can mark it too? It's very unlikely to show up, and since it's already marked for translation in other files, it will not add extra work on translators. > > Signed-off-by: Raphaël Hertzog > --- > bisect.c | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) > > diff --git a/bisect.c b/bisect.c > index a579b5088..8edc7a7a6 100644 > --- a/bisect.c > +++ b/bisect.c > @@ -658,8 +658,8 @@ static void exit_if_skipped_commits(struct commit_list *tried, > if (!tried) > return; > > - printf("There are only 'skip'ped commits left to test.\n" > - "The first %s commit could be any of:\n", term_bad); > + printf(_("There are only 'skip'ped commits left to test.\n" > + "The first %s commit could be any of:\n"), term_bad); > > for ( ; tried; tried = tried->next) > printf("%s\n", oid_to_hex(&tried->item->object.oid)); > @@ -984,7 +984,7 @@ int bisect_next_all(const char *prefix, int no_checkout) > > if (!oidcmp(bisect_rev, current_bad_oid)) { > exit_if_skipped_commits(tried, current_bad_oid); > - printf("%s is the first %s commit\n", oid_to_hex(bisect_rev), > + printf(_("%s is the first %s commit\n"), oid_to_hex(bisect_rev), > term_bad); > show_diff_tree(prefix, revs.commits->item); > /* This means the bisection process succeeded. */ > -- > 2.18.0.rc2 > -- Duy ``` ## Raphael Hertzog, 2018-06-21 15:21 Subject: Re: [PATCH 2/2] i18n: bisect: mark two supplementary strings for translation Message-ID: <20180621152145.GA29912@home.ouaza.com> URL: https://gitlist.dev/e/20180621152145.GA29912%40home.ouaza.com In-Reply-To: ``` Hi, On Thu, 21 Jun 2018, Duy Nguyen wrote: > Nice. There's another string in bisect_common() that should also be > translated: "revision walk setup failed". Maybe you can mark it too? Sure. A new version of the second patch is attached. Cheers, -- Raphaël Hertzog ◈ Debian Developer Support Debian LTS: https://www.freexian.com/services/debian-lts.html Learn to master Debian: https://debian-handbook.info/get/ From 9731f23b9e2f47bdb90e552264c9d030b4f40629 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20Hertzog?= Date: Thu, 21 Jun 2018 16:06:48 +0200 Subject: [PATCH 2/2] i18n: bisect: mark three supplementary strings for translation MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The whole bisect procedure is translated but the last message that the user will see in the process is not translated. Let's fix this. Also mark the "revision walk setup failed" error message for translation. It's already used in other files so will not generate any new string to translate. Signed-off-by: Raphaël Hertzog --- bisect.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/bisect.c b/bisect.c index a579b5088..4943eb333 100644 --- a/bisect.c +++ b/bisect.c @@ -647,7 +647,7 @@ static void bisect_rev_setup(struct rev_info *revs, const char *prefix, static void bisect_common(struct rev_info *revs) { if (prepare_revision_walk(revs)) - die("revision walk setup failed"); + die(_("revision walk setup failed")); if (revs->tree_objects) mark_edges_uninteresting(revs, NULL); } @@ -658,8 +658,8 @@ static void exit_if_skipped_commits(struct commit_list *tried, if (!tried) return; - printf("There are only 'skip'ped commits left to test.\n" - "The first %s commit could be any of:\n", term_bad); + printf(_("There are only 'skip'ped commits left to test.\n" + "The first %s commit could be any of:\n"), term_bad); for ( ; tried; tried = tried->next) printf("%s\n", oid_to_hex(&tried->item->object.oid)); @@ -984,7 +984,7 @@ int bisect_next_all(const char *prefix, int no_checkout) if (!oidcmp(bisect_rev, current_bad_oid)) { exit_if_skipped_commits(tried, current_bad_oid); - printf("%s is the first %s commit\n", oid_to_hex(bisect_rev), + printf(_("%s is the first %s commit\n"), oid_to_hex(bisect_rev), term_bad); show_diff_tree(prefix, revs.commits->item); /* This means the bisection process succeeded. */ -- 2.18.0.rc2 ``` ## Raphael Hertzog, 2018-06-25 15:29 Subject: Re: [PATCH 2/2] i18n: bisect: mark two supplementary strings for translation Message-ID: <20180625152922.GB27849@home.ouaza.com> URL: https://gitlist.dev/e/20180625152922.GB27849%40home.ouaza.com In-Reply-To: <20180621152145.GA29912@home.ouaza.com> ``` Hi, On Thu, 21 Jun 2018, Raphael Hertzog wrote: > On Thu, 21 Jun 2018, Duy Nguyen wrote: > > Nice. There's another string in bisect_common() that should also be > > translated: "revision walk setup failed". Maybe you can mark it too? > > Sure. A new version of the second patch is attached. I haven't had any other feedback. Is there anything else that I should do to get my changes merged? Cheers, -- Raphaël Hertzog ◈ Debian Developer Support Debian LTS: https://www.freexian.com/services/debian-lts.html Learn to master Debian: https://debian-handbook.info/get/ ``` ## Duy Nguyen, 2018-06-30 09:11 Subject: Re: [PATCH 2/2] i18n: bisect: mark two supplementary strings for translation Message-ID: URL: https://gitlist.dev/e/CACsJy8BNVBQFQPKo1SZifS4asi4%2B_hm_0j4MxQk02aPoQqsisA%40mail.gmail.com In-Reply-To: <20180625152922.GB27849@home.ouaza.com> ``` On Mon, Jun 25, 2018 at 5:29 PM Raphael Hertzog wrote: > > Hi, > > On Thu, 21 Jun 2018, Raphael Hertzog wrote: > > On Thu, 21 Jun 2018, Duy Nguyen wrote: > > > Nice. There's another string in bisect_common() that should also be > > > translated: "revision walk setup failed". Maybe you can mark it too? > > > > Sure. A new version of the second patch is attached. > > I haven't had any other feedback. Is there anything else that I should do > to get my changes merged? If Junio has not picked up the patches and did not object either, there's a chance he missed this, so just resend and include him -- Duy ```