gitk: rename zh_CN.po to zh_cn.po
diff mbox series

Message ID 6feff2e73e1c4ca838efcabe90e0978a4d88cb7d.1568710294.git.liu.denton@gmail.com
State New
Headers show
Series
  • gitk: rename zh_CN.po to zh_cn.po
Related show

Commit Message

Denton Liu Sept. 17, 2019, 8:52 a.m. UTC
When running make from a clean environment, all of the *.po files should
be converted into *.msg files. After that, when make is run without any
changes, make should not do anything.

After beffae768a (gitk: Add Chinese (zh_CN) translation, 2017-03-11),
zh_CN.po was introduced. When make was run, a zh_cn.msg file was
generated (notice the lowercase). However, since make is case-sensitive,
it expects zh_CN.po to generate a zh_CN.msg file so make will keep
reattempting to generate a zh_CN.msg so successive make invocations
result in

    Generating catalog po/zh_cn.msg
    msgfmt --statistics --tcl po/zh_cn.po -l zh_cn -d po/
    317 translated messages.

happening continuously.

Rename zh_CN.po to zh_cn.po so that when make generates the zh_cn.msg
file, it will realize that it was successfully generated and only run
once.

Signed-off-by: Denton Liu <liu.denton@gmail.com>
---
 po/{zh_CN.po => zh_cn.po} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename po/{zh_CN.po => zh_cn.po} (100%)

Comments

Junio C Hamano Sept. 17, 2019, 4:48 p.m. UTC | #1
Denton Liu <liu.denton@gmail.com> writes:

> When running make from a clean environment, all of the *.po files should
> be converted into *.msg files. After that, when make is run without any
> changes, make should not do anything.
>
> After beffae768a (gitk: Add Chinese (zh_CN) translation, 2017-03-11),
> zh_CN.po was introduced. When make was run, a zh_cn.msg file was
> generated (notice the lowercase). However, since make is case-sensitive,
> it expects zh_CN.po to generate a zh_CN.msg file so make will keep
> reattempting to generate a zh_CN.msg so successive make invocations
> result in
>
>     Generating catalog po/zh_cn.msg
>     msgfmt --statistics --tcl po/zh_cn.po -l zh_cn -d po/
>     317 translated messages.
>
> happening continuously.
>
> Rename zh_CN.po to zh_cn.po so that when make generates the zh_cn.msg
> file, it will realize that it was successfully generated and only run
> once.

True, and it is not just that.  The install target would fail
because it cannot find zh_CN.msg, I think.

> Signed-off-by: Denton Liu <liu.denton@gmail.com>
> ---
>  po/{zh_CN.po => zh_cn.po} | 0
>  1 file changed, 0 insertions(+), 0 deletions(-)
>  rename po/{zh_CN.po => zh_cn.po} (100%)
>
> diff --git a/po/zh_CN.po b/po/zh_cn.po
> similarity index 100%
> rename from po/zh_CN.po
> rename to po/zh_cn.po

This would make this in line with pt_{pt,br}.po, existing locales
with country code in them.

Reviewed-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano Sept. 17, 2019, 10:14 p.m. UTC | #2
Junio C Hamano <gitster@pobox.com> writes:

> This would make this in line with pt_{pt,br}.po, existing locales
> with country code in them.
>
> Reviewed-by: Junio C Hamano <gitster@pobox.com>

Paul, I've applied this to a clone of gitk locally and merged it
(resutling in 2a4ac71ffb that should be reachable from 'master'), as
it was breaking my "install" tests.

Thanks.

Patch
diff mbox series

diff --git a/po/zh_CN.po b/po/zh_cn.po
similarity index 100%
rename from po/zh_CN.po
rename to po/zh_cn.po