Re: Please pull gitk.git master branch

[Paul Mackerras <paulus@samba.org>]

On Sun, Dec 12, 2010 at 11:40:51PM -0800, Junio C Hamano wrote:
> Junio C Hamano <gitster@pobox.com> writes:
> 
> -- >8 --
> From: Junio C Hamano <gitster@pobox.com>
> Date: Sun, 12 Dec 2010 23:27:21 -0800
> Subject: [PATCH] Rename po/pt_BR.po to po/pt_br.po
> 
> The "msgfmt --tcl pt_BR.po" (at least on my box, GNU gettext 0.17) command
> generates pt_BR.msg, i.e. the country part gets downcased.  The resulting
> runtime (i.e. Tcl i18n) happily reads from pt_br.msg when run with the
> runtime locale set with LANG=pt_BR and/or LC_ALL=pt_BR so it seems to be
> the expected behaviour.
> 
> However, we seem to expect that the resulting file to be named pt_BR.msg,
> and try to generate and install it.
> 
> Currently our Makefile uses $(wildcard po/*.po) to grab the source PO
> files, expects them to produce $(subst .po,.msg,$(ALL_POFILES)), and its
> dependency rule is set to use "%.msg : %.po" pattern, all of which need
> to be adjusted with downcasing from po to msg files; the poor-man's msgfmt
> script also needs to learn the same downcasing.
> 
> Compared to that, renaming the input file to use lowercase countryname
> throughout the toolchain seems to be a lot cleaner solution to this
> glitch.
> 
> Signed-off-by: Junio C Hamano <gitster@pobox.com>
> ---
>  po/{pt_BR.po => pt_br.po} |    0
>  1 files changed, 0 insertions(+), 0 deletions(-)
>  rename po/{pt_BR.po => pt_br.po} (100%)
> 
> diff --git a/po/pt_BR.po b/po/pt_br.po
> similarity index 100%
> rename from po/pt_BR.po
> rename to po/pt_br.po

Sorry about the glitch.  The renaming seems like the best idea, since
all the other .po files have lowercase names.  I was hoping to hear
Alexandre Erwin Ittner's opinion, though.

If I apply this patch in my repo, is that going to cause problems in
yours?  Or, since the commit that adds this file is the head commit, I
could just rewind it and reapply with the lowercase name.  Do you see
problems with that?

Paul.