On 08.03.12 10:21, Torsten Bögershausen wrote:
>
> Am 08.03.2012 um 08:23 schrieb Johannes Sixt:
>
>> Am 3/8/2012 6:54, schrieb Torsten Bögershausen:
>>> On 08.03.12 00:36, Junio C Hamano wrote:
>>>> test_expect_success GETTEXT_ISO_LOCALE 'gettext: Emitting ISO-8859-1 from our UTF-8 *.mo files / Runes' '
>>
>>> ok 4 # skip gettext: Emitting ISO-8859-1 from our UTF-8 *.mo files / Runes (missing GETTEXT_ISO_LOCALE)
>> ^^^^
>> Huh? How can you have tripped over this test in the first place? The
>> prerequisite did not change in Junio's patch. Why was the test not skipped
>> before you started this thread with your own patch?
>>
>> -- Hannes
>>
>
> Hm,
> things are getting confusing.
>
> After re-booting the machine, cloning git ... I get the following on a clean 1.7.10-rc0 (without Junios patch):
>
> tb@birne:~/projects/git/git_clean/t> ./t0204-gettext-reencode-sanity.sh
> # lib-gettext: No is_IS UTF-8 locale available
> # lib-gettext: No is_IS ISO-8859-1 locale available
> ok 1 # skip gettext: Emitting UTF-8 from our UTF-8 *.mo files / Icelandic (missing GETTEXT_LOCALE)
> ok 2 # skip gettext: Emitting UTF-8 from our UTF-8 *.mo files / Runes (missing GETTEXT_LOCALE)
> ok 3 # skip gettext: Emitting ISO-8859-1 from our UTF-8 *.mo files / Icelandic (missing GETTEXT_ISO_LOCALE)
> ok 4 # skip gettext: Emitting ISO-8859-1 from our UTF-8 *.mo files / Runes (missing GETTEXT_ISO_LOCALE)
> ok 5 # skip gettext: Fetching a UTF-8 msgid -> UTF-8 (missing GETTEXT_LOCALE)
> ok 6 # skip gettext: Fetching a UTF-8 msgid -> ISO-8859-1 (missing GETTEXT_ISO_LOCALE)
> ok 7 # skip gettext.c: git init UTF-8 -> UTF-8 (missing GETTEXT_LOCALE)
> ok 8 # skip gettext.c: git init UTF-8 -> ISO-8859-1 (missing GETTEXT_ISO_LOCALE)
> # passed all 8 test(s)
> 1..8
>
> on 5e9637c629702e3d41ad01d95956d1835 the log looks like this:
>
>
> tb@birne:~/projects/git/git_clean/t> ./t0204-gettext-reencode-sanity.sh
> # lib-gettext: Found 'is_IS.UTF-8' as an is_IS UTF-8 locale
> # lib-gettext: Found 'is_IS.ISO8859-1' as an is_IS ISO-8859-1 locale
> ok 1 - gettext: Emitting UTF-8 from our UTF-8 *.mo files / Icelandic
> ok 2 - gettext: Emitting UTF-8 from our UTF-8 *.mo files / Runes
> ok 3 - gettext: Emitting ISO-8859-1 from our UTF-8 *.mo files / Icelandic
> ok 4 - gettext: Emitting ISO-8859-1 from our UTF-8 *.mo files / Runes
> ok 5 - gettext: Fetching a UTF-8 msgid -> UTF-8
> ok 6 - gettext: Fetching a UTF-8 msgid -> ISO-8859-1
> ok 7 - gettext.c: git init UTF-8 -> UTF-8
> ok 8 - gettext.c: git init UTF-8 -> ISO-8859-1
> # passed all 8 test(s)
> 1..8
> tb@birne:~/projects/git/git_clean/t>
>
>
> At the moment I would like to say sorry for the noise.
> If somebody is interested. I can dig into details later this evening (european time)
> /Torsten
Here we have the change from t0204-gettext-reencode-sanity.sh beeing passed
into all tests being skipped under Mac OS X:
42f16113ee87ff667fef3a821e:
# lib-gettext: Found 'is_IS.UTF-8' as an is_IS UTF-8 locale
# lib-gettext: Found 'is_IS.ISO8859-1' as an is_IS ISO-8859-1 locale
ok 1 - gettext: Emitting UTF-8 from our UTF-8 *.mo files / Icelandic
ok 2 - gettext: Emitting UTF-8 from our UTF-8 *.mo files / Runes
ok 3 - gettext: Emitting ISO-8859-1 from our UTF-8 *.mo files / Icelandic
ok 4 - gettext: Emitting ISO-8859-1 from our UTF-8 *.mo files / Runes
ok 5 - gettext: Fetching a UTF-8 msgid -> UTF-8
ok 6 - gettext: Fetching a UTF-8 msgid -> ISO-8859-1
ok 7 - gettext.c: git init UTF-8 -> UTF-8
ok 8 - gettext.c: git init UTF-8 -> ISO-8859-1
# passed all 8 test(s)
1..8
ad17ea73477012bfe1027a8a999e9e2d9f62145:
# lib-gettext: No is_IS UTF-8 locale available
# lib-gettext: No is_IS ISO-8859-1 locale available
ok 1 # skip gettext: Emitting UTF-8 from our UTF-8 *.mo files / Icelandic (missing GETTEXT_LOCALE)
ok 2 # skip gettext: Emitting UTF-8 from our UTF-8 *.mo files / Runes (missing GETTEXT_LOCALE)
ok 3 # skip gettext: Emitting ISO-8859-1 from our UTF-8 *.mo files / Icelandic (missing GETTEXT_ISO_LOCALE)
ok 4 # skip gettext: Emitting ISO-8859-1 from our UTF-8 *.mo files / Runes (missing GETTEXT_ISO_LOCALE)
ok 5 # skip gettext: Fetching a UTF-8 msgid -> UTF-8 (missing GETTEXT_LOCALE)
ok 6 # skip gettext: Fetching a UTF-8 msgid -> ISO-8859-1 (missing GETTEXT_ISO_LOCALE)
ok 7 # skip gettext.c: git init UTF-8 -> UTF-8 (missing GETTEXT_LOCALE)
ok 8 # skip gettext.c: git init UTF-8 -> ISO-8859-1 (missing GETTEXT_ISO_LOCALE)
# passed all 8 test(s)
commit ad17ea734770126bfe1027a8a999e9e2d9f62145
Author: Alex Riesen <raa.lkml@xxxxxxxxx>
Date: Mon Jan 23 14:04:29 2012 -0800
add a Makefile switch to avoid gettext translation in shell scripts
Some systems have gettext.sh (GNU gettext) installed, but it is either
broken or misconfigured in such a way so its output is not usable. In
case the users of these systems are unable or not interested in fixing
them, setting the new Makefile switch should help:
make USE_GETTEXT_SCHEME=fallthrough
This will replace the translation routines with fallthrough versions,
that does not use gettext from the platform.
Signed-off-by: Alex Riesen <raa.lkml@xxxxxxxxx>
Signed-off-by: Junio C Hamano <gitster@xxxxxxxxx>
:100644 100644 9470a1034396a5f3ee36c5d0e6ffc54e21bb3820 a0f2464a9b647fcd6b817e9bb86b7f79190acb01 M Makefile
:100644 100644 6648bd3726f18c95de5737663fae652cadac0003 d5fae993b0c093bdd07079101df303c2c74deae3 M git-sh-i18n.sh
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html