mirror of
https://github.com/git/git.git
synced 2024-05-07 10:26:08 +02:00
i18n: add--interactive: mark plural strings
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 subroutine __n() for plural strings handling. Update documentation to include a description of the new __n() subroutine. Signed-off-by: Vasco Almeida <vascomalmeida@sapo.pt> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Vasco Almeida
Junio C Hamano
parent
901707babc
commit
c4a85c3b8e
3
Makefile
3
Makefile
|
|
@ -2109,7 +2109,8 @@ XGETTEXT_FLAGS_C = $(XGETTEXT_FLAGS) --language=C \
|
|||
--keyword=_ --keyword=N_ --keyword="Q_:1,2"
|
||||
XGETTEXT_FLAGS_SH = $(XGETTEXT_FLAGS) --language=Shell \
|
||||
--keyword=gettextln --keyword=eval_gettextln
|
||||
XGETTEXT_FLAGS_PERL = $(XGETTEXT_FLAGS) --keyword=__ --language=Perl
|
||||
XGETTEXT_FLAGS_PERL = $(XGETTEXT_FLAGS) --language=Perl \
|
||||
--keyword=__ --keyword="__n:1,2"
|
||||
LOCALIZED_C = $(C_OBJ:o=c) $(LIB_H) $(GENERATED_H)
|
||||
LOCALIZED_SH = $(SCRIPT_SH)
|
||||
LOCALIZED_SH += git-parse-remote.sh
|
||||
|
|
|
|||
|
|
@ -668,12 +668,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(__n("added %d path\n", "added %d paths\n",
|
||||
$cnt), $cnt);
|
||||
} elsif ($did eq 'updated') {
|
||||
printf(__n("updated %d path\n", "updated %d paths\n",
|
||||
$cnt), $cnt);
|
||||
} elsif ($did eq 'reverted') {
|
||||
printf(__n("reverted %d path\n", "reverted %d paths\n",
|
||||
$cnt), $cnt);
|
||||
} else {
|
||||
printf(__n("touched %d path\n", "touched %d paths\n",
|
||||
$cnt), $cnt);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -1420,7 +1426,8 @@ sub patch_update_file {
|
|||
} elsif (0 < $response && $response <= $num) {
|
||||
$ix = $response - 1;
|
||||
} else {
|
||||
error_msg "Sorry, only $num hunks available.\n";
|
||||
error_msg sprintf(__n("Sorry, only %d hunk available.\n",
|
||||
"Sorry, only %d hunks available.\n", $num), $num);
|
||||
}
|
||||
next;
|
||||
}
|
||||
|
|
@ -1515,8 +1522,10 @@ sub patch_update_file {
|
|||
elsif ($other =~ /s/ && $line =~ /^s/) {
|
||||
my @split = split_hunk($hunk[$ix]{TEXT}, $hunk[$ix]{DISPLAY});
|
||||
if (1 < @split) {
|
||||
print colored $header_color, "Split into ",
|
||||
scalar(@split), " hunks.\n";
|
||||
print colored $header_color, sprintf(
|
||||
__n("Split into %d hunk.\n",
|
||||
"Split into %d hunks.\n",
|
||||
scalar(@split)), scalar(@split));
|
||||
}
|
||||
splice (@hunk, $ix, 1, @split);
|
||||
$num = scalar @hunk;
|
||||
|
|
|
|||
|
|
@ -13,7 +13,7 @@ BEGIN
|
|||
}
|
||||
}
|
||||
|
||||
our @EXPORT = qw(__);
|
||||
our @EXPORT = qw(__ __n);
|
||||
our @EXPORT_OK = @EXPORT;
|
||||
|
||||
sub __bootstrap_locale_messages {
|
||||
|
|
@ -44,6 +44,7 @@ BEGIN
|
|||
eval {
|
||||
__bootstrap_locale_messages();
|
||||
*__ = \&Locale::Messages::gettext;
|
||||
*__n = \&Locale::Messages::ngettext;
|
||||
1;
|
||||
} or do {
|
||||
# Tell test.pl that we couldn't load the gettext library.
|
||||
|
|
@ -51,6 +52,7 @@ BEGIN
|
|||
|
||||
# Just a fall-through no-op
|
||||
*__ = sub ($) { $_[0] };
|
||||
*__n = sub ($$$) { $_[2] == 1 ? $_[0] : $_[1] };
|
||||
};
|
||||
}
|
||||
|
||||
|
|
@ -70,6 +72,8 @@ =head1 SYNOPSIS
|
|||
|
||||
printf __("The following error occurred: %s\n"), $error;
|
||||
|
||||
printf __n("commited %d file\n", "commited %d files\n", $files), $files;
|
||||
|
||||
=head1 DESCRIPTION
|
||||
|
||||
Git's internal Perl interface to gettext via L<Locale::Messages>. If
|
||||
|
|
@ -87,6 +91,10 @@ =head2 __($)
|
|||
L<Locale::Messages>'s gettext function if all goes well, otherwise our
|
||||
passthrough fallback function.
|
||||
|
||||
=head2 __n($$$)
|
||||
|
||||
L<Locale::Messages>'s ngettext function or passthrough fallback function.
|
||||
|
||||
=head1 AUTHOR
|
||||
|
||||
E<AElig>var ArnfjE<ouml>rE<eth> Bjarmason <avarab@gmail.com>
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
use strict;
|
||||
use warnings;
|
||||
use POSIX qw(:locale_h);
|
||||
use Test::More tests => 8;
|
||||
use Test::More tests => 11;
|
||||
use Git::I18N;
|
||||
|
||||
my $has_gettext_library = $Git::I18N::__HAS_LIBRARY;
|
||||
|
|
@ -31,6 +31,7 @@
|
|||
# more gettext wrapper functions.
|
||||
my %prototypes = (qw(
|
||||
__ $
|
||||
__n $$$
|
||||
));
|
||||
while (my ($sub, $proto) = each %prototypes) {
|
||||
is(prototype(\&{"Git::I18N::$sub"}), $proto, "sanity: $sub has a $proto prototype");
|
||||
|
|
@ -46,6 +47,14 @@
|
|||
my ($got, $expect) = (('TEST: A Perl test string') x 2);
|
||||
|
||||
is(__($got), $expect, "Passing a string through __() in the C locale works");
|
||||
|
||||
my ($got_singular, $got_plural, $expect_singular, $expect_plural) =
|
||||
(('TEST: 1 file', 'TEST: n files') x 2);
|
||||
|
||||
is(__n($got_singular, $got_plural, 1), $expect_singular,
|
||||
"Get singular string through __n() in C locale");
|
||||
is(__n($got_singular, $got_plural, 2), $expect_plural,
|
||||
"Get plural string through __n() in C locale");
|
||||
}
|
||||
|
||||
# Test a basic message on different locales
|
||||
|
|
|
|||
Loading…
Reference in New Issue