diff --git a/gettext.c b/gettext.c index 7da80db453c4c0..35d2c1218db2e2 100644 --- a/gettext.c +++ b/gettext.c @@ -13,7 +13,23 @@ # include # include # ifdef GIT_WINDOWS_NATIVE -# define locale_charset() "UTF-8" + +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 # else