Re: [PATCH v7 00/16] Mark strings in Perl scripts for translation

2016-12-14 Thread Junio C Hamano
Vasco Almeida  writes:

> Changes is this re-roll v7:
> * Add get_comment_line_char subroutine to perl/Git.pm and use it.
> * get_comment_line_char gets the value of core.commentchar configuration
>   variable. It handles the 'auto' value taking '#' in this case as the
>   comment line character.
> * When core.commentchar is not set to one single character, take '#' as the
>   comment line character. This follows the system behaviour programmed in
>   config.c::git_default_core_config.

I gave it a read and I think it is ready to move forward.

Thanks.


[PATCH v7 00/16] Mark strings in Perl scripts for translation

2016-12-14 Thread Vasco Almeida
Changes is this re-roll v7:
* Add get_comment_line_char subroutine to perl/Git.pm and use it.
* get_comment_line_char gets the value of core.commentchar configuration
  variable. It handles the 'auto' value taking '#' in this case as the
  comment line character.
* When core.commentchar is not set to one single character, take '#' as the
  comment line character. This follows the system behaviour programmed in
  config.c::git_default_core_config.

Interdiff from v6 included below.

Vasco Almeida (16):
  Git.pm: add subroutines for commenting lines
  i18n: add--interactive: mark strings for translation
  i18n: add--interactive: mark simple here-documents for translation
  i18n: add--interactive: mark strings with interpolation for
translation
  i18n: clean.c: match string with git-add--interactive.perl
  i18n: add--interactive: mark plural strings
  i18n: add--interactive: mark patch prompt for translation
  i18n: add--interactive: i18n of help_patch_cmd
  i18n: add--interactive: mark edit_hunk_manually message for
translation
  i18n: add--interactive: remove %patch_modes entries
  i18n: add--interactive: mark status words for translation
  i18n: send-email: mark strings for translation
  i18n: send-email: mark warnings and errors for translation
  i18n: send-email: mark string with interpolation for translation
  i18n: send-email: mark composing message for translation
  i18n: difftool: mark warnings for translation

 Makefile  |   3 +-
 builtin/clean.c   |  10 +-
 git-add--interactive.perl | 329 ++
 git-difftool.perl |  22 ++--
 git-send-email.perl   | 191 +++
 perl/Git.pm   |  38 ++
 perl/Git/I18N.pm  |  19 ++-
 t/t0202/test.pl   |  14 +-
 8 files changed, 408 insertions(+), 218 deletions(-)

-- >8 --
diff --git a/git-add--interactive.perl b/git-add--interactive.perl
index 3a6d846..4e0ab5a 100755
--- a/git-add--interactive.perl
+++ b/git-add--interactive.perl
@@ -1072,7 +1072,7 @@ sub edit_hunk_manually {
print $fh @$oldtext;
my $is_reverse = $patch_mode_flavour{IS_REVERSE};
my ($remove_plus, $remove_minus) = $is_reverse ? ('-', '+') : ('+', 
'-');
-   my $comment_line_char = Git::config("core.commentchar") || '#';
+   my $comment_line_char = Git::get_comment_line_char;
print $fh Git::comment_lines sprintf(__ <8 --

-- 
2.11.0.44.g7d42c6c