aboutsummaryrefslogtreecommitdiffstats
path: root/gettext.c
diff options
context:
space:
mode:
authorJohannes Schindelin <johannes.schindelin@gmx.de>2023-03-11 17:54:13 +0100
committerJohannes Schindelin <johannes.schindelin@gmx.de>2023-04-17 21:15:44 +0200
commitb524e896b64f90086d913eebccaff3cd76f96dee (patch)
tree1c95672efd2e489407f128399fe9500bf567d691 /gettext.c
parent0bbcf951943eefbbfee2a7e08b7150bef5b60562 (diff)
parent668f2d53613ac8fd373926ebe219f2c29112d93e (diff)
downloadgit-b524e896b64f90086d913eebccaff3cd76f96dee.tar.gz
Sync with 2.30.9
* maint-2.30: (23 commits) 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 http: support CURLOPT_PROTOCOLS_STR http: prefer CURLOPT_SEEKFUNCTION to CURLOPT_IOCTLFUNCTION http-push: prefer CURLOPT_UPLOAD to CURLOPT_PUT ci: install python on ubuntu ci: use the same version of p4 on both Linux and macOS ci: remove the pipe after "p4 -V" to catch errors github-actions: run gcc-8 on ubuntu-20.04 image ...
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 af2413b47e..16caf5432a 100644
--- a/gettext.c
+++ b/gettext.c
@@ -101,6 +101,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);
@@ -120,6 +122,8 @@ void git_setup_gettext(void)
init_gettext_charset("git");
textdomain("git");
+ git_gettext_enabled = 1;
+
free(p);
}