Merge branch 'va/i18n-perl-scripts'

Porcelain scripts written in Perl are getting internationalized.

* va/i18n-perl-scripts:
  i18n: difftool: mark warnings for translation
  i18n: send-email: mark composing message for translation
  i18n: send-email: mark string with interpolation for translation
  i18n: send-email: mark warnings and errors for translation
  i18n: send-email: mark strings for translation
  i18n: add--interactive: mark status words for translation
  i18n: add--interactive: remove %patch_modes entries
  i18n: add--interactive: mark edit_hunk_manually message for translation
  i18n: add--interactive: i18n of help_patch_cmd
  i18n: add--interactive: mark patch prompt for translation
  i18n: add--interactive: mark plural strings
  i18n: clean.c: match string with git-add--interactive.perl
  i18n: add--interactive: mark strings with interpolation for translation
  i18n: add--interactive: mark simple here-documents for translation
  i18n: add--interactive: mark strings for translation
  Git.pm: add subroutines for commenting lines
This commit is contained in:
Junio C Hamano
2016-12-27 00:11:40 -08:00
8 changed files with 408 additions and 218 deletions

View File

@ -1438,6 +1438,44 @@ sub END {
} # %TEMP_* Lexical Context
=item prefix_lines ( PREFIX, STRING [, STRING... ])
Prefixes lines in C<STRING> with C<PREFIX>.
=cut
sub prefix_lines {
my $prefix = shift;
my $string = join("\n", @_);
$string =~ s/^/$prefix/mg;
return $string;
}
=item get_comment_line_char ( )
Gets the core.commentchar configuration value.
The value falls-back to '#' if core.commentchar is set to 'auto'.
=cut
sub get_comment_line_char {
my $comment_line_char = config("core.commentchar") || '#';
$comment_line_char = '#' if ($comment_line_char eq 'auto');
$comment_line_char = '#' if (length($comment_line_char) != 1);
return $comment_line_char;
}
=item comment_lines ( STRING [, STRING... ])
Comments lines following core.commentchar configuration.
=cut
sub comment_lines {
my $comment_line_char = get_comment_line_char;
return prefix_lines("$comment_line_char ", @_);
}
=back
=head1 ERROR HANDLING