diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2019-07-11 15:16:49 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-07-11 15:16:49 -0700 |
| commit | 0328db0c2b22e9ef83f1e66cad45a330935ddb87 (patch) | |
| tree | 6cda91e5d55a5f212913480e600d16050d199bb5 | |
| parent | Merge branch 'dr/progress-i18n' (diff) | |
| parent | gettext: always use UTF-8 on native Windows (diff) | |
| download | tgif-0328db0c2b22e9ef83f1e66cad45a330935ddb87.tar.xz | |
Merge branch 'kb/windows-force-utf8'
Windows update.
* kb/windows-force-utf8:
gettext: always use UTF-8 on native Windows
| -rw-r--r-- | gettext.c | 20 |
1 files changed, 19 insertions, 1 deletions
@@ -12,7 +12,25 @@ #ifndef NO_GETTEXT # include <locale.h> # include <libintl.h> -# ifdef HAVE_LIBCHARSET_H +# ifdef GIT_WINDOWS_NATIVE + +static const char *locale_charset(void) +{ + const char *env = getenv("LC_ALL"), *dot; + + if (!env || !*env) + env = getenv("LC_CTYPE"); + if (!env || !*env) + env = getenv("LANG"); + + if (!env) + return "UTF-8"; + + dot = strchr(env, '.'); + return !dot ? env : dot + 1; +} + +# elif defined HAVE_LIBCHARSET_H # include <libcharset.h> # else # include <langinfo.h> |