From: Vasco Almeida <vascomalmeida@sapo.pt>
To: Junio C Hamano <gitster@pobox.com>, git@vger.kernel.org
Cc: "Jiang Xin" <worldhello.net@gmail.com>,
"Ævar Arnfjörð Bjarmason" <avarab@gmail.com>,
"David Aguilar" <davvid@gmail.com>
Subject: Re: [PATCH v2 04/11] i18n: add--interactive: mark plural strings
Date: Mon, 26 Sep 2016 18:15:21 +0000 [thread overview]
Message-ID: <1474913721.1035.9.camel@sapo.pt> (raw)
In-Reply-To: <1472646690-9699-5-git-send-email-vascomalmeida@sapo.pt>
A Qua, 31-08-2016 às 12:31 +0000, Vasco Almeida escreveu:
> Mark plural strings for translation. Unfold each action case in one
> entire sentence.
>
> Pass new keyword for xgettext to extract.
>
> Update test to include new subrotine Q__() for plural strings handling.
>
> > Signed-off-by: Vasco Almeida <vascomalmeida@sapo.pt>
> ---
> Makefile | 3 ++-
> git-add--interactive.perl | 24 ++++++++++++++++--------
> perl/Git/I18N.pm | 4 +++-
> t/t0202/test.pl | 11 ++++++++++-
> 4 files changed, 31 insertions(+), 11 deletions(-)
>
> diff --git a/git-add--interactive.perl b/git-add--interactive.perl
> index 4e1e857..08badfa 100755
> --- a/git-add--interactive.perl
> +++ b/git-add--interactive.perl
> @@ -666,12 +666,18 @@ sub status_cmd {
> sub say_n_paths {
> > my $did = shift @_;
> > my $cnt = scalar @_;
> > - print "$did ";
> > - if (1 < $cnt) {
> > - print "$cnt paths\n";
> > - }
> > - else {
> > - print "one path\n";
> > + if ($did eq 'added') {
> > + printf(Q__("added one path\n", "added %d paths\n",
> > + $cnt), $cnt);
> > + } elsif ($did eq 'updated') {
> > + printf(Q__("updated one path\n", "updated %d paths\n",
> > + $cnt), $cnt);
> > + } elsif ($did eq 'reversed') {
> > + printf(Q__("reversed one path\n", "reversed %d paths\n",
This should be 'reverted' not 'reversed'.
> > + $cnt), $cnt);
> > + } else {
> > + printf(Q__("touched one path\n", "touched %d paths\n",
> > + $cnt), $cnt);
> > }
> }
When $cnt is 1 I get the following warning:
Redundant argument in printf at /home/vasco/dev/local/libexec/git-core/git-add--interactive line 680.
The singular form does not have a %d to consume $cnt argument to
printf(). Either we find a way to suppress that warning or we change
the singular form to contain %d.
> @@ -1508,8 +1514,10 @@ sub patch_update_file {
> ...
> > - print colored $header_color, "Split into ",
> > - scalar(@split), " hunks.\n";
> > + print colored $header_color, sprintf(
> > + Q__("Split into %d hunk.\n",
> > + "Split into %d hunks.\n",
> > + scalar(@split)), scalar(@split));
Like we do with this.
> >
> >
next prev parent reply other threads:[~2016-09-26 18:15 UTC|newest]
Thread overview: 46+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-08-31 12:31 [PATCH v2 00/11] Mark strings in perl script for translation Vasco Almeida
2016-08-31 12:31 ` [PATCH v2 01/11] i18n: add--interactive: mark strings " Vasco Almeida
2016-09-25 22:52 ` Junio C Hamano
2016-09-28 12:43 ` Vasco Almeida
2016-09-28 14:29 ` Duy Nguyen
2016-09-28 16:59 ` Junio C Hamano
2016-09-29 21:21 ` Jakub Narębski
2016-08-31 12:31 ` [PATCH v2 02/11] i18n: add--interactive: mark simple here documents " Vasco Almeida
2016-09-25 22:54 ` Junio C Hamano
2016-09-29 14:31 ` Vasco Almeida
2016-09-29 17:05 ` Junio C Hamano
2016-09-29 21:27 ` Jakub Narębski
2016-09-29 21:31 ` Junio C Hamano
2016-10-03 12:43 ` Vasco Almeida
2016-09-30 17:26 ` Jakub Narębski
2016-10-03 13:21 ` Vasco Almeida
2016-08-31 12:31 ` [PATCH v2 03/11] i18n: add--interactive: mark strings with interpolation " Vasco Almeida
2016-09-25 22:57 ` Junio C Hamano
2016-09-30 17:52 ` Jakub Narębski
2016-10-03 12:41 ` Vasco Almeida
2016-08-31 12:31 ` [PATCH v2 04/11] i18n: add--interactive: mark plural strings Vasco Almeida
2016-09-26 18:15 ` Vasco Almeida [this message]
2016-09-26 18:21 ` Junio C Hamano
2016-10-01 16:49 ` Jakub Narębski
2016-10-03 12:46 ` Vasco Almeida
2016-08-31 12:31 ` [PATCH v2 05/11] i18n: add--interactive: mark message for translation Vasco Almeida
2016-09-25 23:09 ` Junio C Hamano
2016-10-01 17:09 ` Jakub Narębski
2016-10-03 12:49 ` Vasco Almeida
2016-08-31 12:31 ` [PATCH v2 06/11] i18n: add--interactive: i18n of help_patch_cmd Vasco Almeida
2016-09-25 23:11 ` Junio C Hamano
2016-08-31 12:31 ` [PATCH v2 07/11] i18n: add--interactive: mark edit_hunk_manually message for translation Vasco Almeida
2016-10-01 18:48 ` Jakub Narębski
2016-08-31 12:31 ` [PATCH v2 08/11] i18n: send-email: mark strings " Vasco Almeida
2016-09-25 23:14 ` Junio C Hamano
2016-09-25 23:18 ` Junio C Hamano
2016-10-01 18:55 ` Jakub Narębski
2016-08-31 12:31 ` [PATCH v2 09/11] i18n: send-email: mark warnings and errors " Vasco Almeida
2016-10-01 19:51 ` Jakub Narębski
2016-08-31 12:31 ` [PATCH v2 10/11] i18n: send-email: mark string with interpolation " Vasco Almeida
2016-08-31 12:31 ` [PATCH v2 11/11] i18n: difftool: mark warnings " Vasco Almeida
2016-09-25 23:21 ` Junio C Hamano
2016-10-01 19:56 ` Jakub Narębski
2016-08-31 17:23 ` [PATCH v2 00/11] Mark strings in perl script " Junio C Hamano
2016-09-25 23:31 ` Junio C Hamano
-- strict thread matches above, loose matches on Subject: below --
2016-06-29 15:09 Vasco Almeida
2016-06-29 15:09 ` [PATCH v2 04/11] i18n: add--interactive: mark plural strings Vasco Almeida
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1474913721.1035.9.camel@sapo.pt \
--to=vascomalmeida@sapo.pt \
--cc=avarab@gmail.com \
--cc=davvid@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=worldhello.net@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).