summaryrefslogtreecommitdiff
path: root/gettext.c
diff options
context:
space:
mode:
authorJohannes Schindelin <johannes.schindelin@gmx.de>2023-03-11 21:18:55 +0100
committerJohannes Schindelin <johannes.schindelin@gmx.de>2023-04-17 21:16:04 +0200
commit1df551ce5c110d08775032f4ab6f8f89a40edb88 (patch)
treef53195cfa9aab58eb2c855be050e601552681b0d /gettext.c
parenteb88fe1ff5ceb34845f0919b8bdc60d8a1703cf6 (diff)
parentecaa3db17183b4a3895ccd0c0c1af01d0e6fed45 (diff)
Sync with 2.36.6
* maint-2.36: (30 commits) Git 2.36.6 Git 2.35.8 Git 2.34.8 Git 2.33.8 Git 2.32.7 Git 2.31.8 tests: avoid using `test_i18ncmp` Git 2.30.9 gettext: avoid using gettext if the locale dir is not present apply --reject: overwrite existing `.rej` symlink if it exists http.c: clear the 'finished' member once we are done with it clone.c: avoid "exceeds maximum object size" error with GCC v12.x range-diff: use ssize_t for parsed "len" in read_patches() range-diff: handle unterminated lines in read_patches() range-diff: drop useless "offset" variable from read_patches() t5604: GETTEXT_POISON fix, conclusion t5604: GETTEXT_POISON fix, part 1 t5619: GETTEXT_POISON fix t0003: GETTEXT_POISON fix, conclusion t0003: GETTEXT_POISON fix, part 1 t0033: GETTEXT_POISON fix ...
Diffstat (limited to 'gettext.c')
-rw-r--r--gettext.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/gettext.c b/gettext.c
index bb5ba1fe7c..7fff88c8da 100644
--- a/gettext.c
+++ b/gettext.c
@@ -102,6 +102,8 @@ static void init_gettext_charset(const char *domain)
setlocale(LC_CTYPE, "C");
}
+int git_gettext_enabled = 0;
+
void git_setup_gettext(void)
{
const char *podir = getenv(GIT_TEXT_DOMAIN_DIR_ENVIRONMENT);
@@ -121,6 +123,8 @@ void git_setup_gettext(void)
init_gettext_charset("git");
textdomain("git");
+ git_gettext_enabled = 1;
+
free(p);
}