From e674ab4e41e1f4f9289e11745ef2d91f410f41ab Mon Sep 17 00:00:00 2001 From: Patrick McDermott Date: Wed, 17 Mar 2021 04:53:37 -0400 Subject: db_lc_messages_get(): Just use setlocale() --- diff --git a/configure.ac b/configure.ac index 64384b3..ea300fa 100644 --- a/configure.ac +++ b/configure.ac @@ -37,7 +37,8 @@ funcs_missing=false AC_CHECK_FUNCS( [\ alphasort calloc dirname free isspace malloc printf putchar \ - realpath scandir sscanf strcasecmp strcmp strdup strndup vprintf + realpath scandir setlocale sscanf strcasecmp strcmp strdup \ + strndup vprintf ], [], [funcs_missing=true]) diff --git a/src/locale.c b/src/locale.c index c5ef596..d738084 100644 --- a/src/locale.c +++ b/src/locale.c @@ -17,28 +17,11 @@ * along with Dodge Balls. If not, see . */ -#include +#include #include "locale.h" const char * db_lc_messages_get(void) { - static char *lang; - - lang = getenv("LC_ALL"); - if (lang != NULL && lang[0] != '\0') { - return lang; - } - - lang = getenv("LC_MESSAGES"); - if (lang != NULL && lang[0] != '\0') { - return lang; - } - - lang = getenv("LANG"); - if (lang != NULL && lang[0] != '\0') { - return lang; - } - - return (lang = NULL); + return setlocale(LC_MESSAGES, ""); } -- cgit v0.9.1