development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-09-17 23:41:33 +00:00
Code Issues Packages Projects Releases Wiki Activity
55917 commits 6 branches 952 tags 532 MiB
Commit graph

835 commits

Author SHA1 Message Date
Ævar Arnfjörð Bjarmason 1ff750b128 tests: make GIT_TEST_GETTEXT_POISON a boolean 
Change the GIT_TEST_GETTEXT_POISON variable from being "non-empty?" to
being a more standard boolean variable.

Since it needed to be checked in both C code and shellscript (via test
-n) it was one of the remaining shellscript-like variables. Now that
we have "env--helper" we can change that.

There's a couple of tricky edge cases that arise because we're using
git_env_bool() early, and the config-reading "env--helper".

If GIT_TEST_GETTEXT_POISON is set to an invalid value die_bad_number()
will die, but to do so it would usually call gettext(). Let's detect
the special case of GIT_TEST_GETTEXT_POISON and always emit that
message in the C locale, lest we infinitely loop.

As seen in the updated tests in t0017-env-helper.sh there's also a
caveat related to "env--helper" needing to read the config for trace2
purposes.

Since the C_LOCALE_OUTPUT prerequisite is lazy and relies on
"env--helper" we could get invalid results if we failed to read the
config (e.g. because we'd loop on includes) when combined with
e.g. "test_i18ngrep" wanting to check with "env--helper" if
GIT_TEST_GETTEXT_POISON was true or not.

I'm crossing my fingers and hoping that a test similar to the one I
removed in the earlier "config tests: simplify include cycle test"
change in this series won't happen again, and testing for this
explicitly in "env--helper"'s own tests.

This change breaks existing uses of
e.g. GIT_TEST_GETTEXT_POISON=YesPlease, which we've documented in
po/README and other places. As noted in [1] we might want to consider
also accepting "YesPlease" in "env--helper" as a special-case.

But as the lack of uproar over 6cdccfce1e ("i18n: make GETTEXT_POISON
a runtime option", 2018-11-08) demonstrates the audience for this
option is a really narrow set of git developers, who shouldn't have
much trouble modifying their test scripts, so I think it's better to
deal with that minor headache now and make all the relevant GIT_TEST_*
variables boolean in the same way than carry the "YesPlease"
special-case forward.

1. https://public-inbox.org/git/xmqqtvckm3h8.fsf@gitster-ct.c.googlers.com/

Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2019-06-21 09:42:49 -07:00
Jiang Xin 0cdb8d2db2 Merge branch 'fr_review' of git://github.com/jnavila/git 
* 'fr_review' of git://github.com/jnavila/git:
  l10n: fr.po: Review French translation
 2019-06-07 16:51:09 +08:00
Jiang Xin d014920079 Merge branch 'master' of git://github.com/alshopov/git-po 
* 'master' of git://github.com/alshopov/git-po:
  l10n: bg.po: Updated Bulgarian translation (4581t)
 2019-06-07 16:50:23 +08:00
Cédric Malard 82eb147dbb l10n: fr.po: Review French translation 
Signed-off-by: Cédric Malard <c.malard-git@valdun.net>
Signed-off-by: Jean-Noel Avila <jn.avila@free.fr>
 2019-06-07 08:54:28 +02:00
Matthias Rüster 219829ae83 l10n: de.po: Update German translation 
Reviewed-by: Ralf Thielow <ralf.thielow@gmail.com>
Signed-off-by: Matthias Rüster <matthias.ruester@gmail.com>
 2019-06-06 07:03:26 +02:00
Ralf Thielow 8c18948b78 l10n: de.po: improve description of 'git reset --quiet' 
Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com>
 2019-06-06 07:03:25 +02:00
Matthias Rüster d314d77577 l10n: TEAMS: Change German translation team leader 
Acked-by: Ralf Thielow <ralf.thielow@gmail.com>
Signed-off-by: Matthias Rüster <matthias.ruester@gmail.com>
 2019-06-05 20:48:37 +02:00
Alexander Shopov de2b0545ee l10n: bg.po: Updated Bulgarian translation (4581t) 
Signed-off-by: Alexander Shopov <ash@kambanaria.org>
 2019-06-05 08:51:15 +02:00
Fangyi Zhou 5b5336320b l10n: zh_CN: Revision for git v2.22.0 l10n 
Revise 51 translations, improving consistency for some phrased.
Update email address for Fangyi Zhou

Signed-off-by: Fangyi Zhou <me@fangyi.io>
Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
 2019-06-05 08:37:30 +08:00
Jiang Xin d46c551928 l10n: zh_CN: for git v2.22.0 l10n round 1~3 
Translate 274 new messages (4581t0f0u) for git 2.22.0.

Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
 2019-06-05 08:37:30 +08:00
Jiang Xin 914bd0923e Merge branch '2.22' of https://github.com/ChrisADR/git-po 
* '2.22' of https://github.com/ChrisADR/git-po:
  l10n: es: 2.22.0 round 3
 2019-06-05 08:35:35 +08:00
Jiang Xin 488ed582d3 Merge branch 'it-l10n-wip' of github.com:AlessandroMenti/git-po 
* 'it-l10n-wip' of github.com:AlessandroMenti/git-po:
  l10n: it.po: Updated Italian translation
 2019-06-05 08:17:28 +08:00
Christopher Diaz Riveros 922a0a7d98 l10n: es: 2.22.0 round 3 
Signed-off-by: Christopher Diaz Riveros <chrisadr@gentoo.org>
 2019-06-04 18:52:28 -05:00
Alessandro Menti bbc55709e7
l10n: it.po: Updated Italian translation 
Signed-off-by: Alessandro Menti <alessandro.menti@alessandromenti.it>
 2019-06-04 22:27:19 +02:00
Jean-Noël Avila 85b66ac50d l10n: fr v2.22.0 rnd 3 
Signed-off-by: Jean-Noël Avila <jn.avila@free.fr>
 2019-06-04 19:53:32 +02:00
Tran Ngoc Quan 77e1962193 l10n: vi.po(4581t): Updated Vietnamese translation for v2.22.0 round 3 
Signed-off-by: Tran Ngoc Quan <vnwildman@gmail.com>
 2019-06-04 08:13:53 +07:00
Jiang Xin 386544cd84 l10n: git.pot: v2.22.0 round 3 (3 new, 2 removed) 
Generate po/git.pot from v2.22.0-rc3 for git v2.22.0 l10n round 3.

Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
 2019-06-04 08:27:36 +08:00
Christopher Diaz Riveros 1c8ba5f1b3 l10n: es: 2.22.0 round 2 
Signed-off-by: Christopher Diaz Riveros <chrisadr@gentoo.org>
 2019-06-03 09:34:50 -05:00
Jiang Xin cb56cf3b2d Merge branch 'master' of https://github.com/vnwildman/git 
* 'master' of https://github.com/vnwildman/git:
  l10n: vi.po(4580t): Updated Vietnamese translation for v2.22.0 round 2
 2019-06-02 22:35:11 +08:00
Jiang Xin c181f4d2d7 Merge branch 'master' of git://github.com/alshopov/git-po 
* 'master' of git://github.com/alshopov/git-po:
  l10n: bg.po: Updated Bulgarian translation (4580t)
 2019-06-02 22:09:35 +08:00
Alexander Shopov 9c21d45420 l10n: bg.po: Updated Bulgarian translation (4580t) 
Signed-off-by: Alexander Shopov <ash@kambanaria.org>
 2019-06-02 09:26:52 +02:00
Tran Ngoc Quan 35655fe726 l10n: vi.po(4580t): Updated Vietnamese translation for v2.22.0 round 2 
Signed-off-by: Tran Ngoc Quan <vnwildman@gmail.com>
 2019-06-01 08:37:57 +07:00
Jean-Noël Avila fc8703c9f6 l10n: fr.po v2.22.0 round 2 
Signed-off-by: Jean-Noël Avila <jn.avila@free.fr>
 2019-05-31 10:46:21 +02:00
Jiang Xin c08fd7307c l10n: git.pot: v2.22.0 round 2 (6 new, 3 removed) 
Generate po/git.pot from v2.22.0-rc2 for git v2.22.0 l10n round 2.

Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
 2019-05-31 14:36:22 +08:00
Jiang Xin ea8a8d04c3 Merge branch 'master' of https://github.com/Softcatala/git-po 
* 'master' of https://github.com/Softcatala/git-po:
  l10n: Update Catalan translation
 2019-05-31 14:32:35 +08:00
Jiang Xin 75a9e02b08 Merge branch 'master' of git://github.com/alshopov/git-po 
* 'master' of git://github.com/alshopov/git-po:
  l10n: bg.po: Updated Bulgarian translation (4577t)
 2019-05-29 22:01:19 +08:00
Alexander Shopov 47e80a2c53 l10n: bg.po: Updated Bulgarian translation (4577t) 
Signed-off-by: Alexander Shopov <ash@kambanaria.org>
 2019-05-29 10:27:27 +02:00
Christopher Diaz Riveros d0b1b61578 l10n: es: 2.22.0 round 1 
Signed-off-by: Christopher Diaz Riveros <chrisadr@gentoo.org>
 2019-05-28 11:33:00 -05:00
Jiang Xin 1e24ee8471 Merge branch 'master' of https://github.com/vnwildman/git 
* 'master' of https://github.com/vnwildman/git:
  l10n: vi.po(4577t): Updated Vietnamese translation for v2.22.0 round 1
 2019-05-21 08:55:54 +08:00
Tran Ngoc Quan 28e0eb8086 l10n: vi.po(4577t): Updated Vietnamese translation for v2.22.0 round 1 
Signed-off-by: Tran Ngoc Quan <vnwildman@gmail.com>
 2019-05-19 08:40:33 +07:00
Jean-Noël Avila 1d9f0b79a0 l10n: fr.po v2.22.0.rnd1 
Signed-off-by: Jean-Noël Avila <jn.avila@free.fr>
 2019-05-17 19:55:39 +02:00
Peter Krefting 4ae76f5e1d l10n: sv.po: Update Swedish translation (4577t0f0u) 
Signed-off-by: Peter Krefting <peter@softwolves.pp.se>
 2019-05-14 15:46:15 +01:00
Peter Krefting 0ea981f863 l10n: sv.po: Update Swedish translation 
Fix mistakes reported by Mattias Engdegård <mattiase@acm.org>.

Signed-off-by: Peter Krefting <peter@softwolves.pp.se>
 2019-05-14 14:47:37 +01:00
Jiang Xin d93ef2a150 l10n: git.pot: v2.22.0 round 1 (270 new, 56 removed) 
Generate po/git.pot from v2.22.0-rc0 for git v2.22.0 l10n round 1.

Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
 2019-05-14 17:09:58 +08:00
Jordi Mas 5a36d17c55 l10n: Update Catalan translation 
Signed-off-by: Jordi Mas <jmas@softcatala.org>
 2019-03-29 07:18:55 +01:00
Jordi Mas 3ece05c5f4 l10n: Fixes to Catalan translation 
Signed-off-by: Jordi Mas <jmas@softcatala.org>
 2019-03-02 19:12:58 +01:00
Tran Ngoc Quan 1fc5279fdb l10n: Updated Vietnamese translation for v2.21 rd2 
Signed-off-by: Tran Ngoc Quan <vnwildman@gmail.com>
 2019-03-01 19:23:16 +08:00
Jean-Noël Avila 29b168aa44 l10n: fr.po remove obsolete entries 
On NetBSD, the version of msgfmt is still 0.14.4. There's no hope for
an upgrade due to some GPLv3 allergy of NetBSD's. This version chokes
on heavily decorated commented entries in po files. It's safer to get
rid of all these obsolete entries.

Signed-off-by: Jean-Noël Avila <jn.avila@free.fr>
 2019-02-26 21:53:01 +01:00
Alexander Shopov ab8f4f5d73 l10n: bg.po: Updated Bulgarian translation (4363t) 
Signed-off-by: Alexander Shopov <ash@kambanaria.org>
 2019-02-23 23:29:23 +02:00
Jiang Xin e7bc80b7ea Merge branch 'master' of https://github.com/ralfth/git-po-de 2019-02-22 22:18:12 +08:00
Ralf Thielow e5a5d5c2c8 l10n: update German translation 
Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com>
Reviewed-by: Matthias Rüster <matthias.ruester@gmail.com>
 2019-02-22 08:47:26 +01:00
Jiang Xin 54fca18313 Merge branch 'bg-submodule-helper-typo' of github.com:pclouds/git-po 2019-02-20 21:40:54 +08:00
Fangyi Zhou 8e4e0555f2 l10n: zh_CN: Revision for git v2.21.0 l10n 
Signed-off-by: Fangyi Zhou <fangyi.zhou@yuriko.moe>
 2019-02-20 21:33:56 +08:00
Jiang Xin 069917778f l10n: zh_CN: for git v2.21.0 l10n round 1~2 
Translate 214 new messages (4363t0f0u) for git 2.21.0.

Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
 2019-02-20 21:33:56 +08:00
Nguyễn Thái Ngọc Duy c2d8f4c73a l10n: bg.po: correct typo 
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
 2019-02-20 20:32:40 +07:00
Peter Krefting 34692d22fa l10n: Update Swedish translation (4363t0f0u) 
Signed-off-by: Peter Krefting <peter@softwolves.pp.se>
 2019-02-20 08:56:20 +01:00
Sebastian Staudt a8a6b15c01 l10n: de.po: fix grammar in message for tag.c 
Signed-off-by: Sebastian Staudt <koraktor@gmail.com>
 2019-02-19 13:53:29 +01:00
Sebastian Staudt 40cbe8ad14 l10n: de.po: fix a message for index-pack.c 
Signed-off-by: Sebastian Staudt <koraktor@gmail.com>
 2019-02-19 13:53:29 +01:00
Sebastian Staudt 567349f54e l10n: de.po: consistent translation of 'root commit' 
'root commit' is usually translated as 'Root-Commit'. But in one
occasion it‘s translated as 'Basis-Commit' which is the translation
for 'base commit'.

Signed-off-by: Sebastian Staudt <koraktor@gmail.com>
 2019-02-19 13:53:29 +01:00
Alessandro Menti bb236fb44a l10n: it: update the Italian translation 
Signed-off-by: Alessandro Menti <alessandro.menti@alessandromenti.it>
 2019-02-19 10:07:24 +08:00