From: "Jakub Narębski" <jnareb@gmail.com>
To: Vasco Almeida <vascomalmeida@sapo.pt>,
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 09/11] i18n: send-email: mark warnings and errors for translation
Date: Sat, 1 Oct 2016 21:51:38 +0200 [thread overview]
Message-ID: <37c2efce-90b1-9415-eb85-64358e43b853@gmail.com> (raw)
In-Reply-To: <1472646690-9699-10-git-send-email-vascomalmeida@sapo.pt>
W dniu 31.08.2016 o 14:31, Vasco Almeida pisze:
> Mark warnings, errors and other messages for translation.
>
Which discovered a few places with questionable code...
(though there is one place with bad handling of translation)
> Signed-off-by: Vasco Almeida <vascomalmeida@sapo.pt>
> ---
> git-send-email.perl | 36 ++++++++++++++++++------------------
> 1 file changed, 18 insertions(+), 18 deletions(-)
>
> diff --git a/git-send-email.perl b/git-send-email.perl
> index 2521832..e7f712e 100755
> --- a/git-send-email.perl
> +++ b/git-send-email.perl
> @@ -118,20 +118,20 @@ sub format_2822_time {
> my $localmin = $localtm[1] + $localtm[2] * 60;
> my $gmtmin = $gmttm[1] + $gmttm[2] * 60;
> if ($localtm[0] != $gmttm[0]) {
> - die "local zone differs from GMT by a non-minute interval\n";
> + die __("local zone differs from GMT by a non-minute interval\n");
> }
> if ((($gmttm[6] + 1) % 7) == $localtm[6]) {
> $localmin += 1440;
> } elsif ((($gmttm[6] - 1) % 7) == $localtm[6]) {
> $localmin -= 1440;
> } elsif ($gmttm[6] != $localtm[6]) {
> - die "local time offset greater than or equal to 24 hours\n";
> + die __("local time offset greater than or equal to 24 hours\n");
As one can see that this is the same message as below, so I wondered
why the same test is repeated... But it is even worse. This test
is first, wrongly described: it checks that the day of week is the
same in local timezone and in UTC / GMT. But second, it is WRONG!
For example if UTC time is just before midnight, then any positive
timezone has different day of week (next day); if UTC is just before
midnight, then any negative timezone has different day of week (previous
day).
$ LC_ALL=C TZ=US/Hawaii date --date="2016-10-01 01:00 UTC"
Fri Sep 30 15:00:00 HST 2016
$ LC_ALL=C TZ=US/Hawaii date --date="2016-10-01 01:00 UTC" --utc
Sat Oct 1 01:00:00 UTC 2016
> }
> my $offset = $localmin - $gmtmin;
> my $offhour = $offset / 60;
> my $offmin = abs($offset % 60);
> if (abs($offhour) >= 24) {
> - die ("local time offset greater than or equal to 24 hours\n");
> + die __("local time offset greater than or equal to 24 hours\n");
This is good test.
> }
>
> return sprintf("%s, %2d %s %d %02d:%02d:%02d %s%02d%02d",
> @@ -199,13 +199,13 @@ sub do_edit {
> map {
> system('sh', '-c', $editor.' "$@"', $editor, $_);
> if (($? & 127) || ($? >> 8)) {
> - die("the editor exited uncleanly, aborting everything");
> + die(__("the editor exited uncleanly, aborting everything"));
> }
> } @_;
> } else {
> system('sh', '-c', $editor.' "$@"', $editor, @_);
> if (($? & 127) || ($? >> 8)) {
> - die("the editor exited uncleanly, aborting everything");
> + die(__("the editor exited uncleanly, aborting everything"));
> }
> }
Here we see some unnecessary code duplication, and thus
message duplication.
> @@ -1410,7 +1410,7 @@ Message-Id: $message_id
> $smtp->code =~ /250|200/ or die "Failed to send $subject\n".$smtp->message;
> }
> if ($quiet) {
> - printf (($dry_run ? "Dry-" : "")."Sent %s\n", $subject);
> + printf (($dry_run ? "Dry-" : ""). __("Sent %s\n"), $subject);
> } else {
> print (($dry_run ? "Dry-" : ""). __("OK. Log says:\n"));
> if (!file_name_is_absolute($smtp_server)) {
You would want to translate Dry-Sent and Dry-OK.
--
Jakub Narębski
next prev parent reply other threads:[~2016-10-01 19:52 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
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 [this message]
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 09/11] i18n: send-email: mark warnings and errors " 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=37c2efce-90b1-9415-eb85-64358e43b853@gmail.com \
--to=jnareb@gmail.com \
--cc=avarab@gmail.com \
--cc=davvid@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=vascomalmeida@sapo.pt \
--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).