diff options
| author | Jeff King <peff@peff.net> | 2015-02-26 03:04:16 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-02-26 22:09:20 (GMT) |
| commit | 93f7d9108a0edf808e1e3bbcdbe6078310c22f9e (patch) | |
| tree | 5bfc28011f1988763b56046034bd131a406e962e /http.c | |
| parent | f18604bbf2c391c689a41fca14cbaeff5e106255 (diff) | |
| download | git-93f7d9108a0edf808e1e3bbcdbe6078310c22f9e.zip git-93f7d9108a0edf808e1e3bbcdbe6078310c22f9e.tar.gz git-93f7d9108a0edf808e1e3bbcdbe6078310c22f9e.tar.bz2 | |
gettext.c: move get_preferred_languages() from http.c
Calling setlocale(LC_MESSAGES, ...) directly from http.c, without
including <locale.h>, was causing compilation warnings. Move the
helper function to gettext.c that already includes the header and
where locale-related issues are handled.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'http.c')
| -rw-r--r-- | http.c | 26 |
1 files changed, 1 insertions, 25 deletions
@@ -8,6 +8,7 @@ #include "credential.h" #include "version.h" #include "pkt-line.h" +#include "gettext.h" int active_requests; int http_is_verbose; @@ -991,31 +992,6 @@ static void extract_content_type(struct strbuf *raw, struct strbuf *type, strbuf_addstr(charset, "ISO-8859-1"); } -/* - * Guess the user's preferred languages from the value in LANGUAGE environment - * variable and LC_MESSAGES locale category if NO_GETTEXT is not defined. - * - * The result can be a colon-separated list like "ko:ja:en". - */ -static const char *get_preferred_languages(void) -{ - const char *retval; - - retval = getenv("LANGUAGE"); - if (retval && *retval) - return retval; - -#ifndef NO_GETTEXT - retval = setlocale(LC_MESSAGES, NULL); - if (retval && *retval && - strcmp(retval, "C") && - strcmp(retval, "POSIX")) - return retval; -#endif - - return NULL; -} - static void write_accept_language(struct strbuf *buf) { /* |